freeglut-cvs — A read-only list that tracks CVS activity.

[Freeglut-cvs] SF.net SVN: freeglut:[1877] trunk/freeglut/freeglut/src/mswin/ fg_main_mswin.c

[<jt...@us...>]

Revision: 1877
          http://sourceforge.net/p/freeglut/code/1877
Author:   jtsiomb
Date:     2022-03-08 01:11:49 +0000 (Tue, 08 Mar 2022)
Log Message:
-----------
implemented SUPER key/modifier support on windows

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2022-03-08 01:11:38 UTC (rev 1876)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2022-03-08 01:11:49 UTC (rev 1877)
@@ -575,7 +575,9 @@
         ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) ||
             ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL  : 0 ) |
         ( ( ( GetKeyState( VK_LMENU    ) < 0 ) ||
-            ( GetKeyState( VK_RMENU    ) < 0 )) ? GLUT_ACTIVE_ALT   : 0 );
+            ( GetKeyState( VK_RMENU    ) < 0 )) ? GLUT_ACTIVE_ALT   : 0 ) |
+		( ( ( GetKeyState( VK_LWIN     ) < 0 ) ||
+            ( GetKeyState( VK_RWIN     ) < 0 )) ? GLUT_ACTIVE_SUPER : 0 );
 }
 
 /* Check whether a button (VK_*BUTTON) is currently depressed. Returns
@@ -631,6 +633,8 @@
         FG_KEY( VK_RIGHT,  GLUT_KEY_RIGHT     );
         FG_KEY( VK_DOWN,   GLUT_KEY_DOWN      );
         FG_KEY( VK_INSERT, GLUT_KEY_INSERT    );
+		FG_KEY( VK_LWIN,   GLUT_KEY_SUPER_L   );
+		FG_KEY( VK_RWIN,   GLUT_KEY_SUPER_R   );
 
     /* handle control, alt and shift. For GLUT, we want to distinguish between left and right presses.
      * The VK_L* & VK_R* left and right Alt, Ctrl and Shift virtual keys are however only used as parameters to GetAsyncKeyState() and GetKeyState()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1876] trunk/freeglut/freeglut

[<jt...@us...>]

Revision: 1876
          http://sourceforge.net/p/freeglut/code/1876
Author:   jtsiomb
Date:     2022-03-08 01:11:38 +0000 (Tue, 08 Mar 2022)
Log Message:
-----------
Added keyboard demo, and changed the spaceball demo to also build on windows

Modified Paths:
--------------
    trunk/freeglut/freeglut/CMakeLists.txt

Added Paths:
-----------
    trunk/freeglut/freeglut/progs/demos/keyboard/
    trunk/freeglut/freeglut/progs/demos/keyboard/keyboard.c

Modified: trunk/freeglut/freeglut/CMakeLists.txt
===================================================================
--- trunk/freeglut/freeglut/CMakeLists.txt	2022-03-07 05:57:37 UTC (rev 1875)
+++ trunk/freeglut/freeglut/CMakeLists.txt	2022-03-08 01:11:38 UTC (rev 1876)
@@ -567,14 +567,13 @@
                          progs/demos/shapes/glmatrix.h
                          progs/demos/shapes/glmatrix.c)
 ADD_DEMO(smooth_opengl3  progs/demos/smooth_opengl3/smooth_opengl3.c)
-IF(UNIX)
-    ADD_DEMO(spaceball       progs/demos/spaceball/spaceball.c
-                             progs/demos/spaceball/vmath.c
-                             progs/demos/spaceball/vmath.h)
-ENDIF()
+ADD_DEMO(spaceball       progs/demos/spaceball/spaceball.c
+                         progs/demos/spaceball/vmath.c
+                         progs/demos/spaceball/vmath.h)
 ADD_DEMO(subwin          progs/demos/subwin/subwin.c)
 ADD_DEMO(timer           progs/demos/timer/timer.c)
 ADD_DEMO(timer_callback  progs/demos/timer_callback/timer.c)
+ADD_DEMO(keyboard        progs/demos/keyboard/keyboard.c)
 
 
 

Added: trunk/freeglut/freeglut/progs/demos/keyboard/keyboard.c
===================================================================
--- trunk/freeglut/freeglut/progs/demos/keyboard/keyboard.c	                        (rev 0)
+++ trunk/freeglut/freeglut/progs/demos/keyboard/keyboard.c	2022-03-08 01:11:38 UTC (rev 1876)
@@ -0,0 +1,156 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <GL/freeglut.h>
+
+void display(void);
+void draw_text(int x, int y, const char *str);
+const char *skeyname(int skey);
+void reshape(int x, int y);
+void keypress(unsigned char key, int x, int y);
+void keyrelease(unsigned char key, int x, int y);
+void skeypress(int key, int x, int y);
+void skeyrelease(int key, int x, int y);
+
+unsigned int modstate;
+int cur_key = -1;
+int cur_skey = -1;
+int win_width, win_height;
+
+int main(int argc, char **argv)
+{
+	glutInit(&argc, argv);
+	glutInitWindowSize(400, 200);
+	glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
+	glutCreateWindow("Keyboard demo");
+
+	glutDisplayFunc(display);
+	glutReshapeFunc(reshape);
+	glutKeyboardFunc(keypress);
+	glutKeyboardUpFunc(keyrelease);
+	glutSpecialFunc(skeypress);
+	glutSpecialUpFunc(skeyrelease);
+
+	glutMainLoop();
+	return 0;
+}
+
+void display(void)
+{
+	char str[256];
+
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	strcpy(str, "Key:");
+	if(cur_key > 0) {
+		if(isprint(cur_key)) {
+			sprintf(str + 4, " '%c'", cur_key);
+		} else {
+			sprintf(str + 4, " 0x%02x", cur_key);
+		}
+
+
+		if(modstate & GLUT_ACTIVE_SHIFT) {
+			strcat(str, "  shift");
+		}
+		if(modstate & GLUT_ACTIVE_CTRL) {
+			strcat(str, "  ctrl");
+		}
+		if(modstate & GLUT_ACTIVE_ALT) {
+			strcat(str, "  alt");
+		}
+		if(modstate & GLUT_ACTIVE_SUPER) {
+			strcat(str, "  super");
+		}
+	}
+	draw_text(win_width / 3, 2 * win_height / 3, str);
+
+	strcpy(str, "Special key: ");
+	if(cur_skey > 0) {
+		strcat(str, skeyname(cur_skey));
+	}
+	draw_text(win_width / 3, win_height / 3, str);
+
+	glutSwapBuffers();
+}
+
+void draw_text(int x, int y, const char *str)
+{
+	glRasterPos2i(x, y);
+	while(*str) {
+		glutBitmapCharacter(GLUT_BITMAP_HELVETICA_18, *str++);
+	}
+}
+
+const char *skeyname(int skey)
+{
+	static const char *fkeys[] = {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12"};
+
+	switch(skey) {
+	case GLUT_KEY_LEFT: return "left";
+	case GLUT_KEY_UP: return "up";
+	case GLUT_KEY_RIGHT: return "right";
+	case GLUT_KEY_DOWN: return "down";
+	case GLUT_KEY_PAGE_UP: return "page up";
+	case GLUT_KEY_PAGE_DOWN: return "page down";
+	case GLUT_KEY_HOME: return "home";
+	case GLUT_KEY_END: return "end";
+	case GLUT_KEY_INSERT: return "insert";
+	case GLUT_KEY_NUM_LOCK: return "num lock";
+	case GLUT_KEY_BEGIN: return "begin";
+	case GLUT_KEY_DELETE: return "delete";
+	case GLUT_KEY_SHIFT_L: return "L Shift";
+	case GLUT_KEY_SHIFT_R: return "R Shift";
+	case GLUT_KEY_CTRL_L: return "L Ctrl";
+	case GLUT_KEY_CTRL_R: return "R Ctrl";
+	case GLUT_KEY_ALT_L: return "L Alt";
+	case GLUT_KEY_ALT_R: return "R Alt";
+	case GLUT_KEY_SUPER_L: return "L Super";
+	case GLUT_KEY_SUPER_R: return "R Super";
+	default:
+		if(skey >= GLUT_KEY_F1 && skey <= GLUT_KEY_F12) {
+			return fkeys[skey - GLUT_KEY_F1];
+		}
+
+		break;
+	}
+	return "<unknown>";
+}
+
+void reshape(int x, int y)
+{
+	win_width = x;
+	win_height = y;
+	glViewport(0, 0, x, y);
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0, x, 0, y, -1, 1);
+}
+
+void keypress(unsigned char key, int x, int y)
+{
+	if(key == 27) exit(0);
+
+	modstate = glutGetModifiers();
+	cur_key = key;
+	glutPostRedisplay();
+}
+
+void keyrelease(unsigned char key, int x, int y)
+{
+	cur_key = -1;
+	glutPostRedisplay();
+}
+
+void skeypress(int key, int x, int y)
+{
+	cur_skey = key;
+	glutPostRedisplay();
+}
+
+void skeyrelease(int key, int x, int y)
+{
+	cur_skey = -1;
+	glutPostRedisplay();
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1875] trunk/freeglut/freeglut

[<jt...@us...>]

Revision: 1875
          http://sourceforge.net/p/freeglut/code/1875
Author:   jtsiomb
Date:     2022-03-07 05:57:37 +0000 (Mon, 07 Mar 2022)
Log Message:
-----------
Added GLUT_ACTIVE_SUPER modifier, and corresponding GLUT_KEY_SUPER_L and
GLUT_KEY_SUPER_R special keys. These should map to Windows and Command
keys on regular PC keyboards and apple keyboards respectively. Only
implemented on X11 for now.

Modified Paths:
--------------
    trunk/freeglut/freeglut/include/GL/freeglut_ext.h
    trunk/freeglut/freeglut/src/x11/fg_main_x11.c

Modified: trunk/freeglut/freeglut/include/GL/freeglut_ext.h
===================================================================
--- trunk/freeglut/freeglut/include/GL/freeglut_ext.h	2022-02-06 11:48:31 UTC (rev 1874)
+++ trunk/freeglut/freeglut/include/GL/freeglut_ext.h	2022-03-07 05:57:37 UTC (rev 1875)
@@ -44,8 +44,15 @@
 #define GLUT_KEY_CTRL_R             0x0073
 #define GLUT_KEY_ALT_L              0x0074
 #define GLUT_KEY_ALT_R              0x0075
+#define GLUT_KEY_SUPER_L            0x0076
+#define GLUT_KEY_SUPER_R            0x0077
 
 /*
+ * Additional GLUT modifiers
+ */
+#define GLUT_ACTIVE_SUPER           0x0008
+
+/*
  * GLUT API Extension macro definitions -- behaviour when the user clicks on an "x" to close a window
  */
 #define GLUT_ACTION_EXIT                         0

Modified: trunk/freeglut/freeglut/src/x11/fg_main_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2022-02-06 11:48:31 UTC (rev 1874)
+++ trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2022-03-07 05:57:37 UTC (rev 1875)
@@ -135,6 +135,8 @@
         ret |= GLUT_ACTIVE_CTRL;
     if( state & Mod1Mask )
         ret |= GLUT_ACTIVE_ALT;
+    if( state & Mod2Mask )
+        ret |= GLUT_ACTIVE_SUPER;
 
     return ret;
 }
@@ -1012,6 +1014,14 @@
                     case XK_Control_R: special = GLUT_KEY_CTRL_R;     break;
                     case XK_Alt_L:     special = GLUT_KEY_ALT_L;      break;
                     case XK_Alt_R:     special = GLUT_KEY_ALT_R;      break;
+                    case XK_Meta_L:
+                    case XK_Super_L:
+                        special = GLUT_KEY_SUPER_L;
+                        break;
+                    case XK_Meta_R:
+                    case XK_Super_R:
+                        special = GLUT_KEY_SUPER_R;
+                        break;
                     }
 
                     /*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1874] trunk/freeglut/web-src/docs/install.php

[<jt...@us...>]

Revision: 1874
          http://sourceforge.net/p/freeglut/code/1874
Author:   jtsiomb
Date:     2022-02-06 11:48:31 +0000 (Sun, 06 Feb 2022)
Log Message:
-----------
updated install.php with simple cmake instructions

Modified Paths:
--------------
    trunk/freeglut/web-src/docs/install.php

Modified: trunk/freeglut/web-src/docs/install.php
===================================================================
--- trunk/freeglut/web-src/docs/install.php	2022-02-06 11:23:35 UTC (rev 1873)
+++ trunk/freeglut/web-src/docs/install.php	2022-02-06 11:48:31 UTC (rev 1874)
@@ -11,41 +11,50 @@
 <div class="textheader">How to install freeglut...</div>
 <p>It's not *that* hard...</p>
 
-<p>Presently, there are few pre-packaged installs, so the recommended method for most users is to follow these instructions.  Even if you have a package system that includes freeglut, you may wish to manually install for a variety of reasons.  A likely reason is simply that the latest version of freeglut may not have been packaged.</p>
+<p>Presently, there are few pre-packaged installs, so the recommended method for most
+users is to follow these instructions.  Even if you have a package system that includes
+freeglut, you may wish to manually install for a variety of reasons.  A likely reason is
+simply that the latest version of freeglut may not have been packaged.</p>
 
-<p>So...</p>
+<p>The following are simple UNIX instructions, see <code>README.cmake</code> in the freeglut
+source distribution, for detailed instructions for your system.</p>
 
 <div class="textheader">Download freeglut</div>
-<p>First, you need to download a freeglut release. Newer is generally better, but unless you know what you're doing, you should use a release marked "Stable." So download the newest Stable release that you can.  (On the other hand, if you discover a bug and want to report it, it is helpful to try to run the "current" freeglut, as we have been known to fix some bugs before they are reported.)</p>
 
+<p>First, you need to download a freeglut release. Newer is generally better, but unless
+you know what you're doing, you should use a release marked "Stable." So download the
+newest Stable release that you can.  (On the other hand, if you discover a bug and want to
+report it, it is helpful to try to run the "current" freeglut, as we have been known to
+fix some bugs before they are reported.)</p>
+
 <div class="textheader">Untar and configure the packages</div>
 <p>Copy the tarball you downloaded into a temporary directory. Untar it as follows:</p>
-<pre>zcat freeglut-2.2.0.tar.bz2 | tar -vxf -</pre>
+<pre>tar xzvf freeglut-X.Y.Z.tar.gz</pre>
 
 <div class="textheader">Change to the resulting directory:</div>
-<pre>cd freeglut-2.X.X</pre>
+<pre>cd freeglut-X.Y.Z</pre>
  
-<div class="textheader">Now, configure the packages:</div>
-<pre>./configure</pre>
+<div class="textheader">Create and change into a build directory:</div>
+<pre>
+mkdir build
+cd build
+</pre>
 
-<p>NetBSD users may need a slightly different command:</p>
+<div class="textheader">Run cmake to generate a Makefile</div>
+<pre>cmake ..</pre>
 
-<pre>LDFLAGS=-Wl,-R/usr/X11R6/lib ./configure</pre>
-
-<p>...to properly handle things.</p>
-
 <div class="textheader">Build and install freeglut</div>
-<p>Once that completes, it's time to build and install freeglut (Note that you will have to be the superuser to make install).</p>
-
 <p>This is as simple as:</p>
 
 <pre>
-make all
-make install
+make
+sudo make install
 </pre>
 
 <p>This will install the libraries, headers, and symlinks to replace GLUT.</p>
 
+<p>For more complete build instructions for all operating systems, please see <code>README.cmake</code>.</p>
+
 <p>For Android, please see the dedicated <a href="android.php">Android page</a>.</p>
 
 <p>For BlackBerry support, please see <code>README.blackberry</code> in the project source code.</p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1873] trunk/release_steps

[<jt...@us...>]

Revision: 1873
          http://sourceforge.net/p/freeglut/code/1873
Author:   jtsiomb
Date:     2022-02-06 11:23:35 +0000 (Sun, 06 Feb 2022)
Log Message:
-----------
Added an unobtrusive file outside of the source directory (next to dcnieho's
github mirror readme), with instructions for preparing freeglut releases.

Added Paths:
-----------
    trunk/release_steps

Added: trunk/release_steps
===================================================================
--- trunk/release_steps	                        (rev 0)
+++ trunk/release_steps	2022-02-06 11:23:35 UTC (rev 1873)
@@ -0,0 +1,39 @@
+Reminder about how to prepare a release
+---------------------------------------
+
+  1. Update VERSION_MAJOR/VERSION_MINOR/VERSION_PATCH in CMakeLists.txt. This
+     needs to reflect the freeglut version number, and has nothing to do with
+     sonames.
+
+  2. Update shared library version numbers:
+      - bump SO_MAJOR on backwards incompatiuble API/ABI changes (this shouldn't
+        ever be necessary).
+      - bump SO_MINOR on backwards compatible API/ABI changes (addition of new
+        enumerations, addition of new functions, etc).
+      - bump SO_REV if only internal changes happened between releases, which do
+        not change the API/ABI of freeglut.
+     At least one of these should be bumped on every release, change SO_REV if
+     nothing else changed.
+
+  3. After commiting the changes due to previous steps, tag the new release:
+     `svn cp trunk/freeglut/freeglut tags/FG_X_Y_Z` (X.Y.Z being the version
+     number). Commit the tagging.
+
+  4. Export a clean copy of the repo and package it:
+      - From the source dir: `svn export . /tmp/freeglut-X.Y.Z`.
+      - Check /tmp/freeglut-X.Y.Z and make sure everything is correct.
+      - From /tmp: `tar czvf freeglut-X.Y.Z.tar.gz freeglut-X.Y.Z`
+
+  5. Go to https://sourceforge.net/projects/freeglut/files/freeglut/ and upload
+     the tarball under a new directory named X.Y.Z.
+     To be safe, re-download the file you just uploaded, and make sure it
+     extracts, and builds correctly.
+
+  6. Update the release download list in trunk/freeglut/web-src/index.php and
+     run the upload script from the web-src directory to update the web page on
+     sourceforge. The upload script expects a file named .sfuser with the
+     sourceforge username of the uploader, otherwise it defaults to $USER. The
+     username can also be overriden by providing it as a command line argument.
+
+  7. Send a message to the freeglut-developer mailing list with the
+     announcement.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1872] trunk/freeglut/web-src/index.php

[<jt...@us...>]

Revision: 1872
          http://sourceforge.net/p/freeglut/code/1872
Author:   jtsiomb
Date:     2022-02-06 11:17:49 +0000 (Sun, 06 Feb 2022)
Log Message:
-----------
web page: added download link for release 3.2.2

Modified Paths:
--------------
    trunk/freeglut/web-src/index.php

Modified: trunk/freeglut/web-src/index.php
===================================================================
--- trunk/freeglut/web-src/index.php	2022-02-06 10:52:24 UTC (rev 1871)
+++ trunk/freeglut/web-src/index.php	2022-02-06 11:17:49 UTC (rev 1872)
@@ -95,6 +95,7 @@
 <div class="indent">
 	<div class="textheader">Stable Releases</div>
 	<p>
+	<a href="http://prdownloads.sourceforge.net/freeglut/freeglut-3.2.2.tar.gz?download">freeglut 3.2.2</a> [<i>Released: 6 February 2022</i>]<br/>
 	<a href="http://prdownloads.sourceforge.net/freeglut/freeglut-3.2.1.tar.gz?download">freeglut 3.2.1</a> [<i>Released: 29 September 2019</i>]<br/>
 	<a href="http://prdownloads.sourceforge.net/freeglut/freeglut-3.2.0.tar.gz?download">freeglut 3.2.0</a> [<i>Released: 16 September 2019</i>]<br/>
 	<a href="http://prdownloads.sourceforge.net/freeglut/freeglut-3.0.0.tar.gz?download">freeglut 3.0.0</a> [<i>Released: 7 March 2015</i>]<br/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1871] tags/FG_3_2_2/

[<jt...@us...>]

Revision: 1871
          http://sourceforge.net/p/freeglut/code/1871
Author:   jtsiomb
Date:     2022-02-06 10:52:24 +0000 (Sun, 06 Feb 2022)
Log Message:
-----------
tagging release 3.2.2

Added Paths:
-----------
    tags/FG_3_2_2/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1870] trunk/freeglut/freeglut/CMakeLists.txt

[<jt...@us...>]

Revision: 1870
          http://sourceforge.net/p/freeglut/code/1870
Author:   jtsiomb
Date:     2022-02-06 10:50:52 +0000 (Sun, 06 Feb 2022)
Log Message:
-----------
bump version numbers before minor release

Modified Paths:
--------------
    trunk/freeglut/freeglut/CMakeLists.txt

Modified: trunk/freeglut/freeglut/CMakeLists.txt
===================================================================
--- trunk/freeglut/freeglut/CMakeLists.txt	2022-02-06 10:28:23 UTC (rev 1869)
+++ trunk/freeglut/freeglut/CMakeLists.txt	2022-02-06 10:50:52 UTC (rev 1870)
@@ -16,19 +16,19 @@
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 
 # setup version numbers
-# TODO: Update these for each release!
+# XXX: Update these for each release!
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 # Update fg_version.h to match the versions number here in cmake
 CONFIGURE_FILE(src/fg_version.h.in src/fg_version.h)
 
-# shared lib version numbers (change before release)
+# shared lib version numbers (XXX: change before release)
 set(SO_MAJOR 3)		# increment on backwards incompatible API/ABI changes
-set(SO_MINOR 11)	# increment on backwards compatible or internal changes
-set(SO_REV 0)		# if nothing else changed increment this
+set(SO_MINOR 11)	# increment on backwards compatible API additions
+set(SO_REV 1)		# increment if only internal changes happened between releases
 
 # FREEGLUT_BUILD_SHARED_LIBS is already a standard CMake variable, but we need to
 # re-declare it here so it will show up in the GUI.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1869] trunk/freeglut/freeglut/doc/

[<jt...@us...>]

Revision: 1869
          http://sourceforge.net/p/freeglut/code/1869
Author:   jtsiomb
Date:     2022-02-06 10:28:23 +0000 (Sun, 06 Feb 2022)
Log Message:
-----------
Removed the doc directory from the source tree, which contained out of date,
unmaintained web pages, last updated in the early 2000s. Its presence was
pointless at best, confusing at worst.

Removed Paths:
-------------
    trunk/freeglut/freeglut/doc/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1868] trunk/freeglut/freeglut/src/fg_geometry.c

[<jt...@us...>]

Revision: 1868
          http://sourceforge.net/p/freeglut/code/1868
Author:   jtsiomb
Date:     2021-12-22 22:01:02 +0000 (Wed, 22 Dec 2021)
Log Message:
-----------
fix crash when calling primitive drawing functions without creating a window (bug report #255)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_geometry.c

Modified: trunk/freeglut/freeglut/src/fg_geometry.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_geometry.c	2021-12-22 16:19:46 UTC (rev 1867)
+++ trunk/freeglut/freeglut/src/fg_geometry.c	2021-12-22 22:01:02 UTC (rev 1868)
@@ -134,9 +134,11 @@
                                 GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2
     )
 {
-    GLint attribute_v_coord  = fgStructure.CurrentWindow->Window.attribute_v_coord;
-    GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal;
+    SFG_Window *win = fgStructure.CurrentWindow;
 
+    GLint attribute_v_coord  = win ? win->Window.attribute_v_coord : -1;
+    GLint attribute_v_normal = win ? win->Window.attribute_v_normal : -1;
+
     if (fgState.HasOpenGL20 && (attribute_v_coord != -1 || attribute_v_normal != -1))
         /* User requested a 2.0 draw */
         fghDrawGeometryWire20(vertices, normals, numVertices,
@@ -178,11 +180,17 @@
 void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices,
                           GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart)
 {
-    GLint attribute_v_coord   = fgStructure.CurrentWindow->Window.attribute_v_coord;
-    GLint attribute_v_normal  = fgStructure.CurrentWindow->Window.attribute_v_normal;
-    GLint attribute_v_texture = fgStructure.CurrentWindow->Window.attribute_v_texture;
+    GLint attribute_v_coord, attribute_v_normal, attribute_v_texture;
+    SFG_Window *win = fgStructure.CurrentWindow;
+    if(win) {
+        attribute_v_coord   = win->Window.attribute_v_coord;
+        attribute_v_normal  = win->Window.attribute_v_normal;
+        attribute_v_texture = win->Window.attribute_v_texture;
+    } else {
+        attribute_v_coord = attribute_v_normal = attribute_v_texture = -1;
+    }
 
-    if (fgStructure.CurrentWindow->State.VisualizeNormals)
+    if (win && win->State.VisualizeNormals)
         /* generate normals for each vertex to be drawn as well */
         fghGenerateNormalVisualization(vertices, normals, numVertices);
 
@@ -193,7 +201,7 @@
                                vertIdxs, numParts, numVertIdxsPerPart,
                                attribute_v_coord, attribute_v_normal, attribute_v_texture);
 
-        if (fgStructure.CurrentWindow->State.VisualizeNormals)
+        if (win && win->State.VisualizeNormals)
             /* draw normals for each vertex as well */
             fghDrawNormalVisualization20(attribute_v_coord);
     }
@@ -202,7 +210,7 @@
         fghDrawGeometrySolid11(vertices, normals, textcs, numVertices,
                                vertIdxs, numParts, numVertIdxsPerPart);
 
-        if (fgStructure.CurrentWindow->State.VisualizeNormals)
+        if (win && win->State.VisualizeNormals)
             /* draw normals for each vertex as well */
             fghDrawNormalVisualization11();
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1867] trunk/freeglut/freeglut/src/fg_gl2.h

[<jt...@us...>]

Revision: 1867
          http://sourceforge.net/p/freeglut/code/1867
Author:   jtsiomb
Date:     2021-12-22 16:19:46 +0000 (Wed, 22 Dec 2021)
Log Message:
-----------
minor: incorrect filename at the top of fg_gl2.h

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_gl2.h

Modified: trunk/freeglut/freeglut/src/fg_gl2.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.h	2021-09-29 13:09:31 UTC (rev 1866)
+++ trunk/freeglut/freeglut/src/fg_gl2.h	2021-12-22 16:19:46 UTC (rev 1867)
@@ -1,5 +1,5 @@
 /*
- * fg_gl2.c
+ * fg_gl2.h
  *
  * Load OpenGL (ES) 2.0 functions used by fg_geometry
  *

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1866] trunk/freeglut/freeglut/progs/demos/shapes/ shapes.c

[<jt...@us...>]

Revision: 1866
          http://sourceforge.net/p/freeglut/code/1866
Author:   jtsiomb
Date:     2021-09-29 13:09:31 +0000 (Wed, 29 Sep 2021)
Log Message:
-----------
shapes demo: added flat shading option (fixed-function only)

Modified Paths:
--------------
    trunk/freeglut/freeglut/progs/demos/shapes/shapes.c

Modified: trunk/freeglut/freeglut/progs/demos/shapes/shapes.c
===================================================================
--- trunk/freeglut/freeglut/progs/demos/shapes/shapes.c	2020-02-26 16:29:18 UTC (rev 1865)
+++ trunk/freeglut/freeglut/progs/demos/shapes/shapes.c	2021-09-29 13:09:31 UTC (rev 1866)
@@ -425,6 +425,7 @@
 static GLboolean animateXRot = GL_FALSE;
 static GLboolean useShader   = GL_FALSE;
 static GLboolean visNormals  = GL_FALSE;
+static GLboolean flat;
 
 /*
  * Enum to tell drawSizeInfo what to draw for each object
@@ -653,10 +654,15 @@
         shapesPrintf (row++, 1, "Perspective projection (p)");
     else
         shapesPrintf (row++, 1, "Orthographic projection (p)");
-    if (useShader)
+    if (useShader) {
         shapesPrintf (row++, 1, "Using shader (s)");
-    else
+    } else {
         shapesPrintf (row++, 1, "Using fixed function pipeline (s)");
+        if (flat)
+            shapesPrintf (row++, 1, "Flat shading (f)");
+        else
+            shapesPrintf (row++, 1, "Smooth shading (f)");
+    }
     if (animateXRot)
         shapesPrintf (row++, 1, "2D rotation (r)");
     else
@@ -683,6 +689,8 @@
 
     glutSetOption(GLUT_GEOMETRY_VISUALIZE_NORMALS,visNormals);  /* Normals visualized or not? */
 
+    glShadeModel(flat ? GL_FLAT : GL_SMOOTH);  /* flat or gouraud shading */
+
     if (useShader && !shaderReady)
         initShader();
 
@@ -820,6 +828,11 @@
                 function_index = 0;
         break;
 
+    case 'F':
+    case 'f':
+        flat ^= 1;
+        break;
+
     case 'N':
     case 'n': visNormals=!visNormals;     break;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1865] trunk/freeglut/freeglut/CMakeLists.txt

[<dc...@us...>]

Revision: 1865
          http://sourceforge.net/p/freeglut/code/1865
Author:   dcnieho
Date:     2020-02-26 16:29:18 +0000 (Wed, 26 Feb 2020)
Log Message:
-----------
Add checks for debug flags for android

(cherry picked from commit e6baf9cee837345edc5063832c9025a6b1629a95)

Modified Paths:
--------------
    trunk/freeglut/freeglut/CMakeLists.txt

Modified: trunk/freeglut/freeglut/CMakeLists.txt
===================================================================
--- trunk/freeglut/freeglut/CMakeLists.txt	2020-02-26 16:29:10 UTC (rev 1864)
+++ trunk/freeglut/freeglut/CMakeLists.txt	2020-02-26 16:29:18 UTC (rev 1865)
@@ -352,6 +352,7 @@
 
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckTypeSize)
+INCLUDE(CheckCCompilerFlag)
 CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILES(unistd.h 	HAVE_UNISTD_H)
 CHECK_INCLUDE_FILES(sys/time.h 	HAVE_SYS_TIME_H)
@@ -470,7 +471,14 @@
         IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid")
         ENDIF()
-        SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+")
+        CHECK_C_COMPILER_FLAG(-O0 HAVE_O0_FLAG)
+        IF(HAVE_O0_FLAG)
+            SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
+        ENDIF()
+        CHECK_C_COMPILER_FLAG(-gstabs+ HAVE_GSTABSP_FLAG)
+        IF(HAVE_gstabsp_FLAG)
+            SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -gstabs+")
+        ENDIF()
     ENDIF()
 ENDIF()
 IF(FREEGLUT_BUILD_SHARED_LIBS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1864] trunk/freeglut/freeglut/CMakeLists.txt

[<dc...@us...>]

Revision: 1864
          http://sourceforge.net/p/freeglut/code/1864
Author:   dcnieho
Date:     2020-02-26 16:29:10 +0000 (Wed, 26 Feb 2020)
Log Message:
-----------
set default FREEGLUT_GLES=ON on android

(cherry picked from commit 0a464e7d6ede859c9f155a5f9fb8cf49fd258374)

Modified Paths:
--------------
    trunk/freeglut/freeglut/CMakeLists.txt

Modified: trunk/freeglut/freeglut/CMakeLists.txt
===================================================================
--- trunk/freeglut/freeglut/CMakeLists.txt	2020-02-21 22:25:31 UTC (rev 1863)
+++ trunk/freeglut/freeglut/CMakeLists.txt	2020-02-26 16:29:10 UTC (rev 1864)
@@ -51,7 +51,11 @@
 ENDIF()
 
 # OpenGL ES support
-OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF)
+IF(ANDROID)
+    OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" ON)
+ELSE()
+    OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF)
+ENDIF()
 
 # option to build either as "glut" (ON) or "freeglut" (OFF)
 IF(WIN32)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1863] trunk/freeglut/freeglut/src

[<jt...@us...>]

Revision: 1863
          http://sourceforge.net/p/freeglut/code/1863
Author:   jtsiomb
Date:     2020-02-21 22:25:31 +0000 (Fri, 21 Feb 2020)
Log Message:
-----------
Work-around for an issue which cropped up with the release of gcc-10. In their
infinite wisdom, they decided to build with -fno-common as default from now on,
breaking every piece of C code which used to declare common symbols in header
files, as was the convention since the dawn of time. We now have to duplicate
all declarations to an arbitrary source file, and change the header-file ones
to prefix them with extern.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_gl2.c
    trunk/freeglut/freeglut/src/fg_gl2.h

Modified: trunk/freeglut/freeglut/src/fg_gl2.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.c	2019-11-17 13:41:44 UTC (rev 1862)
+++ trunk/freeglut/freeglut/src/fg_gl2.c	2020-02-21 22:25:31 UTC (rev 1863)
@@ -27,6 +27,20 @@
 #include "fg_internal.h"
 #include "fg_gl2.h"
 
+#ifndef GL_ES_VERSION_2_0
+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed
+ * names are defined in fg_gl2.h header to reference them, for any other case,
+ * define them as function pointers here.
+ */
+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+FGH_PFNGLBUFFERDATAPROC fghBufferData;
+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+#endif
+
 void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
   if (fgStructure.CurrentWindow != NULL)
     fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;

Modified: trunk/freeglut/freeglut/src/fg_gl2.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.h	2019-11-17 13:41:44 UTC (rev 1862)
+++ trunk/freeglut/freeglut/src/fg_gl2.h	2020-02-21 22:25:31 UTC (rev 1863)
@@ -67,13 +67,13 @@
 typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
 typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
 
-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-FGH_PFNGLBUFFERDATAPROC fghBufferData;
-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
 
 #    endif
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1862] trunk/freeglut/web-src

[<jt...@us...>]

Revision: 1862
          http://sourceforge.net/p/freeglut/code/1862
Author:   jtsiomb
Date:     2019-11-17 13:41:44 +0000 (Sun, 17 Nov 2019)
Log Message:
-----------
removed completed items off the todo list, and corrected html errors

Modified Paths:
--------------
    trunk/freeglut/web-src/freeglut-style.css
    trunk/freeglut/web-src/progress.php

Modified: trunk/freeglut/web-src/freeglut-style.css
===================================================================
--- trunk/freeglut/web-src/freeglut-style.css	2019-10-22 08:12:59 UTC (rev 1861)
+++ trunk/freeglut/web-src/freeglut-style.css	2019-11-17 13:41:44 UTC (rev 1862)
@@ -113,3 +113,8 @@
 	border-bottom: 1px #111166 solid ;
 	width: 100%;
 }
+
+th, td {
+	border-bottom: 1px solid #aaa;
+	vertical-align: top;
+}

Modified: trunk/freeglut/web-src/progress.php
===================================================================
--- trunk/freeglut/web-src/progress.php	2019-10-22 08:12:59 UTC (rev 1861)
+++ trunk/freeglut/web-src/progress.php	2019-11-17 13:41:44 UTC (rev 1862)
@@ -21,7 +21,7 @@
 <tr>
 <th>Feature</th><th>Status</th><th>Milestone</th></tr>
 <tr><td>Android port</td><td>Basic but complete functionality by <a href="http://www.beuc.net/">Sylvain
-Beucler</a>, but there are <a href=docs/android.php#roadmap>todo
+Beucler</a>, but there are <a href="docs/android.php#roadmap">todo
 points</a></td><td>Basic functionality as is now done: 3.0. Future
 enhancements: 3.0 or later.</td></tr>
 
@@ -30,10 +30,6 @@
 Simonetti</a>.</td><td>Basic functionality as is now done: 3.0. Future
 enhancements: 3.0 or later.</td></tr>
 
-<tr><td>callbacks with closures</td><td>Have versions of each callback
-that take an additional void* that is passed back to the user upon
-invocation.</td><td>3.2</td></tr>
-
 <tr><td>Windows 8 touch support</td><td>Windows 8 replaced how touch
 input works, so we need to implement support for that.</td><td>3.2</td></tr>
 
@@ -42,10 +38,6 @@
 href="https://github.com/dcnieho/FreeGLUT/tree/feature_30bit_framebuffer">here</a>.</td><td>3.0
 or later.</td></tr>
 
-<tr><td>GL2+ and GLES 1/2 clean API for geometry</td><td>Done for all (geometry like
-cube, cone, etc, as well as the teapot and other parts of the
-teaset)</td><td>3.0</td></tr>
-
 <tr><td>handling non-western script input to windows</td><td>For
 Windows, see associated <a
 href="https://github.com/dcnieho/FreeGLUT/tree/feature_IMECHAR_callback">github
@@ -73,7 +65,7 @@
 stroke fonts, we can use a similar approach as for the shapes, should
 thus be straightforward. For the bitmap fonts, this is more complex.
 John T suggested "using a glyph atlas texture with GL_STREAM_DRAW VBOs",
-which would get us somewhere. Code could be ripped from his </a
+which would get us somewhere. Code could be ripped from his <a
 href="http://nuclear.mutantstargoat.com/sw/libdrawtext/">libdrawtext
 library</a></td><td>The sooner the better, but will have to wait for
 asap after 3.0.</td></tr>
@@ -83,21 +75,14 @@
 of the two the library will be compiled against. No work has been
 done to move this to an at-runtime API.</td><td>After 3.0</td></tr>
 
-<tr><td>Code reorganized such that platform-specific and display
-server-specific code are decoupled</td><td>Done, thanks John
-Fay!</td><td>3.0</td></tr>
-
 <tr><td>Position callback</td><td>Done: we now have a position callback
 to notify the client when the position of the window
 changed.</td><td>3.0</td></tr>
-<tr><td>
 
 <tr><td>Carbon/Cocoa port</td><td>Not started. As Carbon is legacy, one
 might want to port to Cocoa first or even forget about Carbon all
 together.</td><td>Undecided</td></tr>
 
-<tr><td>Wayland port</td><td>Not started.</td><td>Undecided</td></tr>
-
 <tr><td>Unicode support</td><td>Not started, we'd need to discuss this
 carefully on the mailing list first to minimize impact on the
 API.</td><td>Undecided</td></tr>
@@ -111,6 +96,5 @@
 (Windows, X11 and Android/BlackBerry 10/EGL at the
 moment).</td><td>Undecided</td></tr>
 </table>
-</p>
 
 <?php generateFooter(); ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1861] trunk/freeglut/freeglut/src

[<dc...@us...>]

Revision: 1861
          http://sourceforge.net/p/freeglut/code/1861
Author:   dcnieho
Date:     2019-10-22 08:12:59 +0000 (Tue, 22 Oct 2019)
Log Message:
-----------
Omit mention of autoconf update, autoconf is no longer in use

(cherry picked from commit fbbe1295dd098b58ae9ec83e447c281671f8f938)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h
    trunk/freeglut/freeglut/src/x11/fg_internal_x11.h

Modified: trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h
===================================================================
--- trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h	2019-10-22 08:12:44 UTC (rev 1860)
+++ trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h	2019-10-22 08:12:59 UTC (rev 1861)
@@ -102,7 +102,6 @@
 #include <string.h>
 
 #    if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-/* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
 
 #        include <sys/joystick.h>

Modified: trunk/freeglut/freeglut/src/x11/fg_internal_x11.h
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_internal_x11.h	2019-10-22 08:12:44 UTC (rev 1860)
+++ trunk/freeglut/freeglut/src/x11/fg_internal_x11.h	2019-10-22 08:12:59 UTC (rev 1861)
@@ -136,7 +136,6 @@
 #include <string.h>
 
 #    if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-/* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
 #        include <sys/joystick.h>
 #        define JS_DATA_TYPE joystick

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1860] trunk/freeglut/freeglut/src

[<dc...@us...>]

Revision: 1860
          http://sourceforge.net/p/freeglut/code/1860
Author:   dcnieho
Date:     2019-10-22 08:12:44 +0000 (Tue, 22 Oct 2019)
Log Message:
-----------
Use <sys/joystick.h> on netbsd, too.

<machine/joystick.h> is a compatibility header that only includes
<sys/joystick.h>, and wasn't added to newer architectures.

This helps the build on netbsd/aarch64.

(cherry picked from commit bcfbede38ae8a2ec6933068dfb489e04bc9cc12e)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h
    trunk/freeglut/freeglut/src/x11/fg_internal_x11.h

Modified: trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h
===================================================================
--- trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h	2019-09-29 19:34:52 UTC (rev 1859)
+++ trunk/freeglut/freeglut/src/wayland/fg_internal_wl.h	2019-10-22 08:12:44 UTC (rev 1860)
@@ -105,18 +105,7 @@
 /* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
 
-#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#            include <sys/joystick.h>
-#        else
-/*
- * XXX NetBSD/amd64 systems may find that they have to steal the
- * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.
- * XXX I cannot comment whether that works for the interface, but
- * XXX it lets you compile...(^&  I do not think that we can do away
- * XXX with this header.
- */
-#            include <machine/joystick.h>         /* For analog joysticks */
-#        endif
+#        include <sys/joystick.h>
 #        define JS_DATA_TYPE joystick
 #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #    endif

Modified: trunk/freeglut/freeglut/src/x11/fg_internal_x11.h
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_internal_x11.h	2019-09-29 19:34:52 UTC (rev 1859)
+++ trunk/freeglut/freeglut/src/x11/fg_internal_x11.h	2019-10-22 08:12:44 UTC (rev 1860)
@@ -138,19 +138,7 @@
 #    if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
 /* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
-
-#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#            include <sys/joystick.h>
-#        else
-/*
- * XXX NetBSD/amd64 systems may find that they have to steal the
- * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.
- * XXX I cannot comment whether that works for the interface, but
- * XXX it lets you compile...(^&  I do not think that we can do away
- * XXX with this header.
- */
-#            include <machine/joystick.h>         /* For analog joysticks */
-#        endif
+#        include <sys/joystick.h>
 #        define JS_DATA_TYPE joystick
 #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #    endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1859] trunk/freeglut/web-src/index.php

[<jt...@us...>]

Revision: 1859
          http://sourceforge.net/p/freeglut/code/1859
Author:   jtsiomb
Date:     2019-09-29 19:34:52 +0000 (Sun, 29 Sep 2019)
Log Message:
-----------
updated release list on the website

Modified Paths:
--------------
    trunk/freeglut/web-src/index.php

Modified: trunk/freeglut/web-src/index.php
===================================================================
--- trunk/freeglut/web-src/index.php	2019-09-29 19:08:11 UTC (rev 1858)
+++ trunk/freeglut/web-src/index.php	2019-09-29 19:34:52 UTC (rev 1859)
@@ -87,7 +87,7 @@
     href="https://sourceforge.net/p/freeglut/code/HEAD/tarball?path=/trunk/freeglut/freeglut">tarball
     of current trunk</a>, or <a href="help.php#svn">grabbing a copy from
     svn</a>, and give us feedback on how it worked for you. All this
-    will eventually become a freeglut 3.1 release.</p>
+    will eventually become a freeglut 3.4 release.</p>
 	<p>There are no presently active testing releases.</p>
 </div>
 
@@ -95,6 +95,7 @@
 <div class="indent">
 	<div class="textheader">Stable Releases</div>
 	<p>
+	<a href="http://prdownloads.sourceforge.net/freeglut/freeglut-3.2.1.tar.gz?download">freeglut 3.2.1</a> [<i>Released: 29 September 2019</i>]<br/>
 	<a href="http://prdownloads.sourceforge.net/freeglut/freeglut-3.2.0.tar.gz?download">freeglut 3.2.0</a> [<i>Released: 16 September 2019</i>]<br/>
 	<a href="http://prdownloads.sourceforge.net/freeglut/freeglut-3.0.0.tar.gz?download">freeglut 3.0.0</a> [<i>Released: 7 March 2015</i>]<br/>
 	<a href="http://prdownloads.sourceforge.net/freeglut/freeglut-2.8.1.tar.gz?download">freeglut 2.8.1</a> [<i>Released: 5 April 2013</i>]<br/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1858] tags/FG_3_2_1/

[<jt...@us...>]

Revision: 1858
          http://sourceforge.net/p/freeglut/code/1858
Author:   jtsiomb
Date:     2019-09-29 19:08:11 +0000 (Sun, 29 Sep 2019)
Log Message:
-----------
tagging for release 3.2.1

Added Paths:
-----------
    tags/FG_3_2_1/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1857] tags/FG_3_2_1_RC1/

[<jt...@us...>]

Revision: 1857
          http://sourceforge.net/p/freeglut/code/1857
Author:   jtsiomb
Date:     2019-09-25 20:46:36 +0000 (Wed, 25 Sep 2019)
Log Message:
-----------
tagging 3.2.1 rc1

Added Paths:
-----------
    tags/FG_3_2_1_RC1/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1856] trunk/freeglut/freeglut/CMakeLists.txt

[<jt...@us...>]

Revision: 1856
          http://sourceforge.net/p/freeglut/code/1856
Author:   jtsiomb
Date:     2019-09-25 20:43:34 +0000 (Wed, 25 Sep 2019)
Log Message:
-----------
updated version number to prepare for release 3.2.1

Modified Paths:
--------------
    trunk/freeglut/freeglut/CMakeLists.txt

Modified: trunk/freeglut/freeglut/CMakeLists.txt
===================================================================
--- trunk/freeglut/freeglut/CMakeLists.txt	2019-09-25 10:08:07 UTC (rev 1855)
+++ trunk/freeglut/freeglut/CMakeLists.txt	2019-09-25 20:43:34 UTC (rev 1856)
@@ -19,7 +19,7 @@
 # TODO: Update these for each release!
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 # Update fg_version.h to match the versions number here in cmake

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1855] trunk/freeglut/freeglut/src

[<jt...@us...>]

Revision: 1855
          http://sourceforge.net/p/freeglut/code/1855
Author:   jtsiomb
Date:     2019-09-25 10:08:07 +0000 (Wed, 25 Sep 2019)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_internal.h
    trunk/freeglut/freeglut/src/fg_window.c
    trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_window_x11_glx.c

Modified: trunk/freeglut/freeglut/src/fg_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_internal.h	2019-09-18 11:58:31 UTC (rev 1854)
+++ trunk/freeglut/freeglut/src/fg_internal.h	2019-09-25 10:08:07 UTC (rev 1855)
@@ -1166,7 +1166,7 @@
 #define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}
 
 int fghMapBit( int mask, int from, int to );
-int fghIsLegacyContextRequested( void );
+int fghIsLegacyContextRequested( SFG_Window *win );
 void fghContextCreationError( void );
 int fghNumberOfAuxBuffersRequested( void );
 

Modified: trunk/freeglut/freeglut/src/fg_window.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_window.c	2019-09-18 11:58:31 UTC (rev 1854)
+++ trunk/freeglut/freeglut/src/fg_window.c	2019-09-25 10:08:07 UTC (rev 1855)
@@ -62,9 +62,15 @@
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
-int fghIsLegacyContextRequested( void )
+int fghIsLegacyContextRequested( SFG_Window *win )
 {
-    return fgState.MajorVersion < 2 || (fgState.MajorVersion == 2 && fgState.MinorVersion <= 1);
+	int vmajor = fgState.MajorVersion;
+	int vminor = fgState.MinorVersion;
+	/* XXX: menu windows are drawn with the fixed function pipeline, therefore
+	 * the context created for them can't be a modern core-profile context.
+	 * Force the traditional context creation for menu windows.
+	 */
+    return vmajor < 2 || (vmajor == 2 && vminor <= 1) || win->IsMenu;
 }
 
 int fghNumberOfAuxBuffersRequested( void )

Modified: trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2019-09-18 11:58:31 UTC (rev 1854)
+++ trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2019-09-25 10:08:07 UTC (rev 1855)
@@ -145,7 +145,7 @@
     PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
 
     /* If nothing fancy has been required, leave the context as it is */
-    if ( fghIsLegacyContextRequested() )
+    if ( fghIsLegacyContextRequested(window) )
     {
         return;
     }

Modified: trunk/freeglut/freeglut/src/x11/fg_window_x11_glx.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_window_x11_glx.c	2019-09-18 11:58:31 UTC (rev 1854)
+++ trunk/freeglut/freeglut/src/x11/fg_window_x11_glx.c	2019-09-25 10:08:07 UTC (rev 1855)
@@ -220,7 +220,7 @@
   CreateContextAttribsProc createContextAttribs = (CreateContextAttribsProc) fgPlatformGetProcAddress( "glXCreateContextAttribsARB" );
  
   /* glXCreateContextAttribsARB not found, yet the user has requested the new context creation */
-  if ( !createContextAttribs && !fghIsLegacyContextRequested() ) {
+  if ( !createContextAttribs && !fghIsLegacyContextRequested(window) ) {
     fgWarning( "OpenGL >2.1 context requested but glXCreateContextAttribsARB is not available! Falling back to legacy context creation" );
 	fgState.MajorVersion = 2;
 	fgState.MinorVersion = 1;
@@ -227,7 +227,7 @@
   }
 
   /* If nothing fancy has been required, simply use the old context creation GLX API entry */
-  if ( fghIsLegacyContextRequested() || !createContextAttribs )
+  if ( fghIsLegacyContextRequested(window) || !createContextAttribs )
   {
     context = glXCreateNewContext( dpy, config, render_type, share_list, direct );
     if ( context == NULL ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1854] trunk/freeglut/freeglut/CMakeLists.txt

[<jt...@us...>]

Revision: 1854
          http://sourceforge.net/p/freeglut/code/1854
Author:   jtsiomb
Date:     2019-09-18 11:58:31 +0000 (Wed, 18 Sep 2019)
Log Message:
-----------
fixed bug #251: freeglut cmake modules installation would disregard
CMAKE_INSTALL_LIBDIR

Modified Paths:
--------------
    trunk/freeglut/freeglut/CMakeLists.txt

Modified: trunk/freeglut/freeglut/CMakeLists.txt
===================================================================
--- trunk/freeglut/freeglut/CMakeLists.txt	2019-09-18 11:53:32 UTC (rev 1853)
+++ trunk/freeglut/freeglut/CMakeLists.txt	2019-09-18 11:58:31 UTC (rev 1854)
@@ -622,7 +622,7 @@
     "${CMAKE_CURRENT_BINARY_DIR}/FreeGLUT/FreeGLUTConfig.cmake"
     @ONLY
 )
-SET(ConfigPackageLocation lib/cmake/FreeGLUT)
+SET(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/FreeGLUT)
 INSTALL(EXPORT FreeGLUTTargets
     FILE FreeGLUTTargets.cmake
     NAMESPACE FreeGLUT::

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Freeglut-cvs] SF.net SVN: freeglut:[1853] trunk/freeglut/freeglut/CMakeLists.txt

[<jt...@us...>]

Revision: 1853
          http://sourceforge.net/p/freeglut/code/1853
Author:   jtsiomb
Date:     2019-09-18 11:53:32 +0000 (Wed, 18 Sep 2019)
Log Message:
-----------
Fixed failure to install glut.h header file when FREEGLUT_REPLACE_GLUT is
enabled (bug #250)

Modified Paths:
--------------
    trunk/freeglut/freeglut/CMakeLists.txt

Modified: trunk/freeglut/freeglut/CMakeLists.txt
===================================================================
--- trunk/freeglut/freeglut/CMakeLists.txt	2019-09-18 10:45:42 UTC (rev 1852)
+++ trunk/freeglut/freeglut/CMakeLists.txt	2019-09-18 11:53:32 UTC (rev 1853)
@@ -73,7 +73,7 @@
     include/GL/freeglut_std.h
 )
 IF(FREEGLUT_REPLACE_GLUT)
-    LIST(APPEND FREEGLUT_SRCS
+    LIST(APPEND FREEGLUT_HEADERS
         include/GL/glut.h
     )
 ENDIF()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.