Diederick Niehorster [Wed, 27 Aug 2014 10:14:44 +0000 (10:14 +0000)]
caption height should include the width of the border atop the window
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1700
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 27 Aug 2014 05:47:05 +0000 (05:47 +0000)]
resizer demo:
some breaks missing in keyboard switch
added instruction text for which buttons can be pressed
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1699
7f0cb862-5218-0410-a997-
914c9d46530a
Nigel Stewart [Mon, 18 Aug 2014 02:00:40 +0000 (02:00 +0000)]
For builds not using cmake, generate fg_version.h to match cmake-specified version number.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1696
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Mon, 18 Aug 2014 00:52:53 +0000 (00:52 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1695
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Tue, 24 Jun 2014 07:03:16 +0000 (07:03 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1694
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 1 Jun 2014 11:04:09 +0000 (11:04 +0000)]
Rewrite EGL attributes using our ATTRIB/ATTRIB_VAL macros
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1690
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 1 Jun 2014 09:48:51 +0000 (09:48 +0000)]
EGL is always double-buffered
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1688
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 1 Jun 2014 09:24:47 +0000 (09:24 +0000)]
Unify GLES1 and GLES2 (libraries are compatible and can be co-linked)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1687
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 1 Jun 2014 03:50:51 +0000 (03:50 +0000)]
add menu to opengl 3 demo. Should work as menu windows have their own classic context
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1686
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 14 May 2014 22:02:41 +0000 (22:02 +0000)]
KEY_EVENT macro exists in windows 8.1 API: renamed it. Also renamed KEY macro to be safe.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1683
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 14 May 2014 18:31:58 +0000 (18:31 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1682
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 14 May 2014 18:28:53 +0000 (18:28 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1681
7f0cb862-5218-0410-a997-
914c9d46530a
Lindley French [Fri, 11 Apr 2014 13:41:49 +0000 (13:41 +0000)]
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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1680
7f0cb862-5218-0410-a997-
914c9d46530a
Michal Stawinski [Wed, 5 Mar 2014 01:40:18 +0000 (01:40 +0000)]
Fix issues with context lost on Android
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1678
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:35:48 +0000 (10:35 +0000)]
Added comments about GLES 3.0 support with 2.0 references.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1677
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:35:35 +0000 (10:35 +0000)]
BlackBerry and Android -Added ability for developer to choose OpenGL ES version (2.0 or 3.0) via glutInitContextVersion (only the major version is used)
BlackBerry specific
-Added better documentation on required window bit depth for BlackBerry.
-Modified screen format picking so it will choose either RGBA8888 or RGB565 instead of always using RGBA8888
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1676
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:35:22 +0000 (10:35 +0000)]
Updated toolchain so that it does a more exact check if this is for PlayBook or BlackBerry 10 Fixed bug with keyboard on PlayBook where keyboard heights only occurred on rotation, and resize would occur twice because of it and resize wouldn't happen for keyboard
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1675
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:35:05 +0000 (10:35 +0000)]
Added BlackBerry PlayBook support Bug memleak when getting the number of mouse buttons on a non-PlayBook where an appropriate device is found and the value is returned
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1674
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:34:49 +0000 (10:34 +0000)]
Info logging only shows in debug compilation Added support for UseCurrentContext flag Updated fghPlatformCloseWindowEGL for performance so that eglMakeCurrent isn't invoked unless it's the current window and that the EGL context isn't destroyed unless no other windows uses
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1673
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:34:32 +0000 (10:34 +0000)]
Hardcoded the RGB bitdepths for EGL surface creation.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1672
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:34:17 +0000 (10:34 +0000)]
Made glutGet, for window width and height, return width and height determined by device rotation Now handles keyboard open/close (along wit device rotation while the keyboard is open) and resize The "back" operation now returns an ESCAPE key
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1671
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:33:57 +0000 (10:33 +0000)]
Added support for rotation so an app can be rotated and FG will resize and manage the window in the background Additional documentation explaining why certain functions are implemented in the manner they are Changed QNX macro to a non deprecated one
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1670
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:33:38 +0000 (10:33 +0000)]
Added (though commented out) support for setting window position
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1669
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:33:23 +0000 (10:33 +0000)]
Placeholder for window sizes Prevent navigator event 0x0 to show as unknown (though it is unknown... it's not defined in navigator.h)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1668
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:33:07 +0000 (10:33 +0000)]
Added full support for WindowStatus App status is now based on actual app status instead of window visibility
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1667
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:32:52 +0000 (10:32 +0000)]
Fixed bug where if statement didn't have parenthesis, causing it to just exit
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1666
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:32:39 +0000 (10:32 +0000)]
Implemented a small work around for no current window being set while executing the event handler
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1665
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:29:59 +0000 (10:29 +0000)]
Added support for the scroll wheel when using the simulator
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1664
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:29:44 +0000 (10:29 +0000)]
Forgot to reset modifiers once done with modifiers.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1663
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:29:30 +0000 (10:29 +0000)]
Added support for key modifiers
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1662
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:29:17 +0000 (10:29 +0000)]
Added ability to get mouse button count or touch ID count.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1661
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:29:03 +0000 (10:29 +0000)]
Added ability to get screen size of display
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1660
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:28:48 +0000 (10:28 +0000)]
Restructuring of when screen context and events are started stopped, created and destroyed
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1659
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:28:29 +0000 (10:28 +0000)]
Added keyboard states for BlackBerry
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1658
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:28:14 +0000 (10:28 +0000)]
Added two more navigator states (that might be implemented) for BlackBerry
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1657
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:27:59 +0000 (10:27 +0000)]
Prevented case where no window was set when waiting for events.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1656
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:27:43 +0000 (10:27 +0000)]
Converted the odd double spaces into 4 space tabs
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1655
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:27:24 +0000 (10:27 +0000)]
Minor order change in Android/BlackBerry CMake, one comment for BlackBerry window
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1654
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:27:08 +0000 (10:27 +0000)]
Added a couple event cases for BlackBerry that are common to prevent them being listed as unknown events.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1653
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:26:52 +0000 (10:26 +0000)]
Removed fg_main_blackberry.h. It wasn't needed
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1652
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:26:37 +0000 (10:26 +0000)]
Made sure that windows created on BlackBerry are registered as fullscreen, for now. Added more logging in fgPlatformProcessSingleEvent on BlackBerry. Better handling of key repeats on BlackBerry by taking into account global and window settings.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1651
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:26:20 +0000 (10:26 +0000)]
Can use input devices from x11 (serial input... unlikely to ever be used, but you never know) Fixed bug in fg_window_egl:fgPlatformSetWindow where a NULL window may be passed and cause a segfault Fixed bug where navigator events were never started Take into account DisplayMode when creating window buffers Proper fgPlatformSystemTime implementation (from fg_main_x11) Added support for mutlitouch (from fg_main_windows)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1650
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:26:00 +0000 (10:26 +0000)]
Minor change so that OpenGL ES 1.x can be used for BlackBerry
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1649
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:25:47 +0000 (10:25 +0000)]
Implemented BlackBerry main (initial version)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1648
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:25:29 +0000 (10:25 +0000)]
Final commit before implementing main loop. All other code is implemented to the same level as Android.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1647
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:25:10 +0000 (10:25 +0000)]
Implemented fg_window_blackberry.c to initialize and cleanup windows Implemented a BlackBerry specific fg_init so that bps can be started and stopped.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1646
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:24:45 +0000 (10:24 +0000)]
Android and BlackBerry have a fair amount of overlap, for now.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1645
7f0cb862-5218-0410-a997-
914c9d46530a
Rcmaniac25 [Fri, 24 Jan 2014 10:24:23 +0000 (10:24 +0000)]
Initial commit of BlackBerry implementation. It compiles, but doesn't have required functions implemented.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1644
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 23 Jan 2014 02:28:02 +0000 (02:28 +0000)]
-sync command line option now causes X server to operate in synchronized/blocking mode
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1643
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 22 Jan 2014 12:06:59 +0000 (12:06 +0000)]
should be using GetKeyState not GetAsyncKeyState to check for modifier keys as we care which modifiers were active at the time of the key/mouse press we are processing
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1642
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 22 Jan 2014 10:09:57 +0000 (10:09 +0000)]
implement handling of GLDebugSwitch: we use glutReportErrors to check for errors in each iteration of the glut mainloop if requested
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1641
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 21 Jan 2014 10:52:53 +0000 (10:52 +0000)]
Applied Bruce Merry's patch fixing bug #206 (segfault on shutdown in the AMD/ATI fglrx driver).
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1640
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Tue, 21 Jan 2014 10:50:05 +0000 (10:50 +0000)]
fixed timer.c: wouldn't compile in C89 mode due to recent change which added two
for loops with a loop variable declared in the statement itself.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1639
7f0cb862-5218-0410-a997-
914c9d46530a
Sébastien Rombauts [Sat, 18 Jan 2014 01:57:14 +0000 (01:57 +0000)]
Fixed CMake UNIX config when building only "freeglut_static" or only the shared library
- was setting a property on "freeglut" while "FREEGLUT_BUILD_SHARED_LIBS" was "OFF"
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1638
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 17 Jan 2014 16:18:46 +0000 (16:18 +0000)]
timer demo now has a menu to:
- set flicker tempo
- test whether menus can be modified in the callback (there was a regression with this in freeglut 2.8.1 that was perchance already fixed in r1583, but make sure we're testing this from now on)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1637
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 17 Jan 2014 16:18:35 +0000 (16:18 +0000)]
add small note: closing menu before executing callback is also important so that the callback can actually modify the menu
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1636
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 15 Jan 2014 03:22:37 +0000 (03:22 +0000)]
note about using near far variable names
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1631
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 11 Jan 2014 04:56:50 +0000 (04:56 +0000)]
Created or replaced branch /trunk from /trunk:1627
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1630
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 9 Nov 2013 05:33:02 +0000 (05:33 +0000)]
Fixing problem with non-client area becoming unresponsive on Windows due to mouse capture that isn't released. Thanks Philipp Kutin (on list!) for figuring this out and proposing a solution.
-> It appears GetAsyncKeyState's return can be non-zero even when the queried key is not pressed
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1627
7f0cb862-5218-0410-a997-
914c9d46530a
John Tsiombikas [Wed, 28 Aug 2013 14:33:07 +0000 (14:33 +0000)]
Applied James DeLisle's patch adding EWMH _NET_WM_PID support.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1626
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 19 May 2013 17:04:04 +0000 (17:04 +0000)]
Find this kind of bug is definitely out of my juridiction - please, PLEASE maintain a list of changes to apply on each port. Having negative elapsed time messed the animations so weird that you can't guess where that came from.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1625
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 19 May 2013 15:05:39 +0000 (15:05 +0000)]
Make Android work again - adapt to recent changes and fix use of GL-nonES function
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1623
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 19 May 2013 15:02:32 +0000 (15:02 +0000)]
Identify Android thread in the logs
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1622
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 19 May 2013 15:01:33 +0000 (15:01 +0000)]
Fix random crash
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1621
7f0cb862-5218-0410-a997-
914c9d46530a
Sylvain Beucler [Sun, 19 May 2013 14:57:13 +0000 (14:57 +0000)]
Fix compilation warning about unused variables and functions
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1620
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 20 Apr 2013 14:04:21 +0000 (14:04 +0000)]
fgProcessWork, not fgPlatformProcessWork
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1618
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 20 Apr 2013 14:04:06 +0000 (14:04 +0000)]
strip out GLUT_DISPLAY_CALLBACK from worklist _before_ calling display callback. Any postredisplay in the display callback will then be honored, but no unnecessary redisplay work will be called due to redisplays queued during resize, visibility and other such processing
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1617
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 18 Apr 2013 01:53:21 +0000 (01:53 +0000)]
should not strip out GLUT_DISPLAY_CALLBACK at the end of processing work. It kills the glutPostRedisplay inside the display callback method of getting your window continuously redrawn...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1616
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 7 Apr 2013 12:21:03 +0000 (12:21 +0000)]
part of dealing with work is platform independent, so moved it to platform independent part of code
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1615
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 7 Apr 2013 08:04:46 +0000 (08:04 +0000)]
redisplay is now also on the work list instead of handled separately
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1614
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sun, 7 Apr 2013 08:03:48 +0000 (08:03 +0000)]
doc that timers are sorted by endtime + don't call fgElapsedTime() if no timers to check, its a waste
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1613
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 6 Apr 2013 14:08:59 +0000 (14:08 +0000)]
Menu's work again in gamemode too now. We have to do a normal ShowWindow in gamemode, or the menu won't pop up over the gamemode window.
Also now using fgState.ActiveMenus instead of enumerating to see if there is an active menu
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1612
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 6 Apr 2013 10:20:42 +0000 (10:20 +0000)]
cleanup a debug statement
show flag should be SW_SHOWNA, not SW_SHOWNOACTIVATE according to docs
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1611
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 6 Apr 2013 10:17:04 +0000 (10:17 +0000)]
clicking in another window also no longer closed the menu unless focus was changed. Fixed in click checker in general menu code, so it'll improve menus on X11 as well. Our Windows part now only needed for when losing focus because switching to a non-FreeGLUT window
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1610
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 6 Apr 2013 10:16:27 +0000 (10:16 +0000)]
now that menu's no longer take focus from their parent, clicking the non-client area of the parent no longer closed the menu. fixed.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1609
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 6 Apr 2013 10:15:53 +0000 (10:15 +0000)]
added a function to translate WM_ messages to text, for debugging
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1608
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 6 Apr 2013 10:15:19 +0000 (10:15 +0000)]
now handling WM_MOUSEACTIVATE so that menus don't get activated upon mouseclick
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1607
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Sat, 6 Apr 2013 10:14:41 +0000 (10:14 +0000)]
fix in fgUpdateMenuHighlight: clicked entry is always the active entry already, so no while loop. also, ignore clicks on a submenu's parent entry
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1606
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 5 Apr 2013 11:39:14 +0000 (11:39 +0000)]
no idea where this folder came from, think its an error of my git-svn
client. anyway, removing...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1602
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 5 Apr 2013 10:51:07 +0000 (10:51 +0000)]
Change FREEGLUT_WARNINGS and *_ERRORS to FREEGLUT_PRINT_WARNINGS and *_ERRORS
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1599
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 5 Apr 2013 09:13:48 +0000 (09:13 +0000)]
implemented WM_DISPLAYCHANGE message handler per patch in very old bug report (1212167). This for us only helps make sure that glutGet(GLUT_SCREEN_WIDTH) and glutGet(GLUT_SCREEN_HEIGHT) return the correct values, and help make sure menu placement is clipped against the correct window extents. Thanks Dan!
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1597
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Fri, 5 Apr 2013 02:55:45 +0000 (02:55 +0000)]
forgot to add teapot to sourcelist for gles1 and gles2 builds
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1591
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 14:32:29 +0000 (14:32 +0000)]
menu fonts API improved
No more glutSetOption, casting void* to int and back is not safe
glutSetMenuFont now takes menuID as param
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1588
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 11:04:17 +0000 (11:04 +0000)]
added cursor changing to resizer demo, for testing
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1587
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 10:54:44 +0000 (10:54 +0000)]
instead of separate Pause and Resume CBs, we now have a AppStatus CB which passes flags to indicate which state was entered. more extensible
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1586
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 10:36:44 +0000 (10:36 +0000)]
some cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1585
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 10:20:43 +0000 (10:20 +0000)]
and with 0xFF to indicate to runtime that we want to strip out higher bits - otherwise we get a runtime error when "Smaller Type Checks" is enabled
Thanks Jason Wilkins!
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1584
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 10:13:45 +0000 (10:13 +0000)]
menu changes based on patch by Jason Wilkins:
- when menu window is shown, the menu's window no longer becomes the active window on windows (we thus don't steal focus from the active window).
- when menu is active and mouse is pressed outside the active menu and if the pressed button is bound to a menu, the old menu is now closed while a new one immediately appears
- menus now hide before their callback is executed, so they don't linger around if callback execution takes a while
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1583
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 10:13:04 +0000 (10:13 +0000)]
can now set the font used for a menu
set default font using glutSetOption(GLUT_MENU_FONT,...) and set font of current menu using glutSetMenuFont()
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1582
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 10:12:02 +0000 (10:12 +0000)]
error in checking if mouse is in window when opening menu...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1581
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 04:49:13 +0000 (04:49 +0000)]
dont wait till window visible when creating menu, as menu won't be shown until first use...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1580
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 04:28:53 +0000 (04:28 +0000)]
don't show window when creating menu (better fix then making it very small and hiding it asap...
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1579
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 02:08:55 +0000 (02:08 +0000)]
variable declaration in wrong place
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1578
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 01:56:39 +0000 (01:56 +0000)]
- moving to a new way of handling window changes (position, size, visibility)
- we now use a work list and all actions queued up in that list get executed in the main loop, just before redraws are called
- simplified redrawing on windows, now no longer doing so in response to WM_PAINT message. This allows us to full control over when we draw
- now simplified use of state variables in X11 and andriod
- resize, reposition etc callback now processed thru notify checkers that call callback only if needed
- worklist also has an init work type which is executed once for every window, just before the window receives its first draw. This gets rid of hacks to call the reshape function once (that only worked for windows that are created before mainloop is entered)
- in init work processor we also check for presence of draw callback as not having one is an error following GLUT.
- some cleanup in general
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1577
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 01:29:17 +0000 (01:29 +0000)]
using FREE_GLUT_BUILD_STATIC_LIBS and FREEGLUT_BUILD_SHARED_LIBS instead of their unprefixed counterparts to avoid these defs leaking into build settings for other projects.
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1576
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Thu, 4 Apr 2013 01:23:27 +0000 (01:23 +0000)]
change CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR as requested on tracker ( Jim ( d3x0r ) - 2013-03-18 11:36:51 PDT )
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1575
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Wed, 3 Apr 2013 11:20:56 +0000 (11:20 +0000)]
to check for menu opening/closing upon button press, should pass cursor position in the window, not in the root window
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1574
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 1 Apr 2013 15:40:51 +0000 (15:40 +0000)]
cleaned up a bunch of warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1573
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 1 Apr 2013 15:12:49 +0000 (15:12 +0000)]
bit more cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1572
7f0cb862-5218-0410-a997-
914c9d46530a
Diederick Niehorster [Mon, 1 Apr 2013 12:25:53 +0000 (12:25 +0000)]
note about glutSetVertexAttribTexCoord2 in shapes demo
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1571
7f0cb862-5218-0410-a997-
914c9d46530a