Diederick C. Niehorster
ef2b555342
Merge remote-tracking branch 'svn/trunk' into git_master
2019-09-27 19:02:30 +02:00
jtsiomb
142c7af2e6
updated version number to prepare for release 3.2.1
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1856 7f0cb862-5218-0410-a997-914c9d46530a
2019-09-25 20:43:34 +00:00
Diederick C. Niehorster
54f8610a1a
Merge remote-tracking branch 'svn/trunk' into git_master
2019-09-25 16:36:56 +02:00
jtsiomb
dda17d2506
Fixed bug #252 : menu windows are drawn with immediate mode and the fixed
...
function pipeline, and therefore we must make sure the context created for them
is not a core profile context. Previously if the user requested a core profile
context, this would apply to menu windows too, and they would appear black.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1855 7f0cb862-5218-0410-a997-914c9d46530a
2019-09-25 10:08:07 +00:00
jtsiomb
ff0bded3ea
fixed bug #251 : freeglut cmake modules installation would disregard
...
CMAKE_INSTALL_LIBDIR
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1854 7f0cb862-5218-0410-a997-914c9d46530a
2019-09-18 11:58:31 +00:00
jtsiomb
31606f4f88
Fixed failure to install glut.h header file when FREEGLUT_REPLACE_GLUT is
...
enabled (bug #250 )
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1853 7f0cb862-5218-0410-a997-914c9d46530a
2019-09-18 11:53:32 +00:00
jtsiomb
8085e72291
Version bump in cmake, that should have been done for 3.2.0. Changed SO_MINOR
...
due to introduction of the new ucall entry points
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1852 7f0cb862-5218-0410-a997-914c9d46530a
2019-09-18 10:45:42 +00:00
Diederick C. Niehorster
34a9babc2e
Merge remote-tracking branch 'svn/trunk' into git_master
2019-09-17 09:55:04 +02:00
jtsiomb
b28fd0d96e
updated the website upload script
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1851 7f0cb862-5218-0410-a997-914c9d46530a
2019-09-17 00:13:21 +00:00
jtsiomb
53e7d2895c
updated the webpage with the freeglut 3.2.0 release
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1850 7f0cb862-5218-0410-a997-914c9d46530a
2019-09-16 23:53:47 +00:00
Diederick C. Niehorster
727f44411a
Merge remote-tracking branch 'svn/trunk' into git_master
2019-09-11 21:22:18 +02:00
jtsiomb
796b7d2f56
A couple of fixes in fg_joystick_x11.c identified in bug report #249
...
- The correct way to set the O_NONBLOCK flag, is to OR that flag with existing
flags. Previously we were overriding everything else and setting the flags
value to O_NONBLOCK directly. Unlikely to cause a problem because we probably
don't have any other flags in the newly opened file descriptor, but strictly
spaking it was incorrect.
- If ioctl JSIOCGAXES and JSIOCGBUTTONS could fail, as it stands, it would
clobber the value of joy->num_axes/joy->num_buttons. It can't fail, but maybe
in the future who knows. Let's be safe.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1848 7f0cb862-5218-0410-a997-914c9d46530a
2019-09-11 13:24:28 +00:00
Diederick C. Niehorster
9e9347eebc
Merge remote-tracking branch 'svn/trunk' into git_master
2019-09-02 22:12:58 +02:00
jtsiomb
2239d6c54d
Fixed namespace pollution due to a number of global symbols missing an fg prefix
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1846 7f0cb862-5218-0410-a997-914c9d46530a
2019-08-14 10:33:31 +00:00
Diederick C. Niehorster
012936e84d
Merge remote-tracking branch 'svn/trunk' into git_master
2019-06-07 09:12:59 +02:00
jtsiomb
f645974902
Applied Christian's change to drop unnecessary dependency to X11 libraries we
...
don't actually use, by asking cmake to link with X11_X11_LIB instead of the
catch-all X11_LIBRARIES.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1845 7f0cb862-5218-0410-a997-914c9d46530a
2019-03-26 18:55:42 +00:00
Diederick C. Niehorster
9ea7d99574
Merge remote-tracking branch 'svn/trunk' into git_master
2018-10-10 08:18:27 +02:00
jtsiomb
4a4f400ca7
Fixed mousewheel callbacks under X11. (bug #247 , github issue #66 )
...
The code had the incorrect assumption that button numbers mapped to the wheel
follow after the last "real" button as returned by the GLUT_NUM_MOUSE_BUTTONS
query, which in turn resolves to a call to XGetPointerMapping. In reality the
X server always sends button presses for 4 and 5 when a wheel is turned down/up
respectively, and the rest of the mouse buttons (if any) follow afterwards.
Also XGetPointerMapping doesn't seem to reliably return the number of actual
buttons, and in any case the wheel "buttons" are certainly included in the
count as they can be remapped.
Since we can't know if buttons after 5 are further wheels or regular buttons
this modification only ever invokes the wheel callback for wheel 0.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1844 7f0cb862-5218-0410-a997-914c9d46530a
2018-10-10 05:23:33 +00:00
Diederick C. Niehorster
263c106d9c
Merge remote-tracking branch 'svn/trunk' into git_master
2018-09-29 09:36:01 +02:00
jtsiomb
29313e5313
fixed spaceball button callback (x11) compatibility with original GLUT: button
...
numbers should start from 1, not 0.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1843 7f0cb862-5218-0410-a997-914c9d46530a
2018-09-29 06:05:26 +00:00
Diederick C. Niehorster
c8d14b13af
Merge remote-tracking branch 'svn/trunk' into git_master
2018-04-03 00:11:13 +02:00
jtsiomb
89c58f2256
- fallback to non-sRGB visuals if the context creation failed (GLX-only)
...
- added new glutGet query: GLUT_WINDOW_SRGB (untested on windows)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1842 7f0cb862-5218-0410-a997-914c9d46530a
2018-04-02 03:16:50 +00:00
Diederick C. Niehorster
4bc7de3645
Merge remote-tracking branch 'svn/trunk' into git_master
2018-03-27 09:41:53 +02:00
dcnieho
20e9df4141
variable wasn't declared before rest of function. Thanks Markus Israelsson and Vinnie
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1841 7f0cb862-5218-0410-a997-914c9d46530a
2018-03-27 07:41:18 +00:00
Diederick C. Niehorster
79c2f10235
Merge remote-tracking branch 'svn/trunk' into git_master
2018-03-26 22:33:49 +02:00
dcnieho
b8a9827c5b
cleaning up mixed tabs and spaces
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1840 7f0cb862-5218-0410-a997-914c9d46530a
2018-03-26 20:32:31 +00:00
Diederick C. Niehorster
39af18f0e6
Merge remote-tracking branch 'svn/trunk' into git_master
2018-03-26 22:24:51 +02:00
dcnieho
a2fef0a9bb
fix that stereo shutter glasses for nVidia setups did not engage. We lose the ability to have child windows as the WS_POPUP style doesn't play nice with them, but thats a small price to pay as we estimate them to be rare for stereo displays. Thanks Markus Israelsson
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1839 7f0cb862-5218-0410-a997-914c9d46530a
2018-03-26 20:24:31 +00:00
Diederick C. Niehorster
9de8fe42b6
Merge remote-tracking branch 'svn/trunk' into git_master
2018-03-24 09:52:12 +01:00
dcnieho
b50503822a
Fix build for Android using clang compiler.
...
(cherry picked from commit 8366af203e
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1838 7f0cb862-5218-0410-a997-914c9d46530a
2018-03-24 08:51:51 +00:00
Diederick C. Niehorster
3499dffc7e
Merge pull request #65 from tehnick/fix-android-clang
...
Fix build for Android using clang compiler.
2018-03-24 09:46:28 +01:00
Boris Pek
8366af203e
Fix build for Android using clang compiler.
2017-12-15 03:29:54 +03:00
Diederick C. Niehorster
cd7f5e9964
Merge remote-tracking branch 'svn/trunk' into git_master
2017-10-23 21:02:09 +02:00
dcnieho
d1adda4783
clear window workmask when queuing up window for destruction. All callbacks (except destroy) are removed from the window already anyway. This fixes a problem where a newly created window that is immediately destroyed again causes an error-exit because it is still being inited and at that point it is found that no display callback has been set, which is an error.
...
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1837 7f0cb862-5218-0410-a997-914c9d46530a
2017-10-23 19:01:09 +00:00
Diederick C. Niehorster
89cf92a221
Merge remote-tracking branch 'svn/trunk' into git_master
2017-10-23 20:23:32 +02:00
dcnieho
173c394399
Little fix'es.
...
macOS, BlackBerry.
(cherry picked from commit 033e58b75d
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1836 7f0cb862-5218-0410-a997-914c9d46530a
2017-10-23 18:22:43 +00:00
Diederick C. Niehorster
517dbec8a8
Merge pull request #61 from Firsla/patch-1
...
Little fix'es.
2017-10-23 20:20:45 +02:00
Firsla
033e58b75d
Little fix'es.
...
macOS, BlackBerry.
2017-10-13 13:04:13 +03:00
Diederick C. Niehorster
a5e7ca9303
Merge remote-tracking branch 'svn/trunk' into git_master
2017-07-31 22:49:49 +02:00
dcnieho
5bcf802a95
Fix build on NetBSD.
...
(cherry picked from commit 1236c76445
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1835 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-31 20:49:26 +00:00
dcnieho
72e830f256
Fixed freeglut.pdb install for builds with MSVC compiler and NMake.
...
The CMake variable "MSVC" indicates that the Visual Studio compiler is
used but when using that compiler and the "NMake Makefiles JOM" build
generator the *.pdb is wasn't output in a "Debug" directory.
(cherry picked from commit 4e6bceed00
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1834 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-31 20:49:16 +00:00
Diederick C. Niehorster
c1a3a1e456
Merge pull request #60 from 0-wiz-0/git_master
...
Fix build on NetBSD.
2017-07-31 22:47:32 +02:00
Thomas Klausner
1236c76445
Fix build on NetBSD.
2017-07-30 23:38:33 +02:00
Diederick C. Niehorster
08bb28dece
Merge pull request #59 from titorgalaxy/git_master
...
Fixed freeglut.pdb install for builds with MSVC compiler and NMake.
2017-07-30 10:03:27 +02:00
Sean Moore
4e6bceed00
Fixed freeglut.pdb install for builds with MSVC compiler and NMake.
...
The CMake variable "MSVC" indicates that the Visual Studio compiler is
used but when using that compiler and the "NMake Makefiles JOM" build
generator the *.pdb is wasn't output in a "Debug" directory.
2017-07-29 03:37:58 -04:00
Diederick C. Niehorster
d27ca503e5
Merge remote-tracking branch 'svn/trunk' into git_master
2017-07-21 17:15:27 +02:00
dcnieho
5442c0abbf
Fixed warnings on Linux where GCC under padantic complained ISO C casting wasn't legal
...
(cherry picked from commit 13ed05fe8d
)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1833 7f0cb862-5218-0410-a997-914c9d46530a
2017-07-21 15:13:44 +00:00
Diederick C. Niehorster
dfdb61f768
Merge pull request #58 from rcmaniac25/bugfix/callback_code_isnt_iso_c_compliant
...
Fixed warnings on Linux where GCC under padantic complained ISO C casting wasn't legal
2017-07-21 17:12:32 +02:00
Rcmaniac25
13ed05fe8d
Fixed warnings on Linux where GCC under padantic complained ISO C casting wasn't legal
2017-07-21 01:13:30 -04:00
Diederick C. Niehorster
78bf24e101
Merge remote-tracking branch 'svn/trunk' into git_master
2017-07-12 22:45:46 +02:00