开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:freeglut.spec Changed

@@ -1,12 +1,11 @@
 Name: freeglut
-Version: 3.0.0
-Release: 11
+Version: 3.4.0
+Release: 1
 Summary: A freely licensed alternative to the GLUT library
 License: MIT
 URL: http://freeglut.sourceforge.net
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: https://downloads.sourceforge.net/openglut/openglut-0.6.3-doc.tar.gz
-Patch0: gcc-10.patch
 
 BuildRequires: gcc gcc-c++ cmake libXi-devel libICE-devel
 BuildRequires: pkgconfig libGLU-devel libXext-devel libXxf86vm-devel
@@ -60,13 +59,17 @@
 %files devel
 %{_includedir}/GL/*.h
 %{_libdir}/libglut.so
-%{_libdir}/pkgconfig/freeglut.pc
+%{_libdir}/pkgconfig/glut.pc
+%{_libdir}/cmake/FreeGLUT/*
 
 %files help
 %{_mandir}/man3/*
-%doc README doc/*.png doc/*.html
+%doc README.md doc/html/*.png doc/html/*.html
 
 %changelog
+* Tue Oct 17 2023 wangkai <13474090681@163.com> - 3.4.0-1
+- Update to 3.4.0
+
 * Fri Jul 30 2021 linjiaxin5 <linjiaxin5@huawei.com> - 3.0.0-11
 - Fix failure caused by GCC upgrade to 10

_service:tar_scm:gcc-10.patch Deleted

@@ -1,45 +0,0 @@
---- a/src/fg_gl2.c
-+++ b/src/fg_gl2.c
-@@ -26,6 +26,20 @@
- #include <GL/freeglut.h>
- #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)
---- a/src/fg_gl2.h
-+++ b/src/fg_gl2.h
-@@ -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

_service Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/README Deleted

@@ -1,61 +0,0 @@
-BRIEF OVERVIEW
-==============
-
-This is the freeglut package.
-
-Freeglut, the Free OpenGL Utility Toolkit, is meant to be a free alternative to
-Mark Kilgard's GLUT library. Freeglut is free software, distributed under an
-MIT/X11 style license. You are free to use, modify, and redistribute FreeGLUT
-with or without modifications (see COPYING for details).
-
-PORTS
-=====
-
-Currently supported platforms:
- - UNIX systems with X11 (such as GNU/Linux, FreeBSD, etc)
- - MS Windows
- - MacOS X with XQuartz (no native Cocoa support yet)
- - Android (NDK)
- - Blackberry
-
-Consult the platform-specific readme files for details on the level of support
-and build instructions.
-
-
-INSTALLATION
-============
-
-See README.cmake as a starting point, as well as the other README
-files for further info.
-
-
-CONTRIBUTING
-============
-
-Patches for bugfixes and new features are certainly welcome. Please send patches
-to the freeglut-developer mailing list (see CONTACT below).
-
-Feel free to report any bugs you encounter, using our bug tracking system:
-https://sourceforge.net/p/freeglut/bugs/
-Feature requests are also welcome at:
-https://sourceforge.net/p/freeglut/feature-requests/
-
-If your bug report needs urgent attention, please also post a message to the
-aforementioned freeglut-developer mailing list, to make sure we'll see it ASAP.
-
-
-CONTACT
-=======
-
-FreeGLUT website: http://freeglut.sourceforge.net
-
-FreeGLUT mailing lists:
- - developer: https://lists.sourceforge.net/lists/listinfo/freeglut-developer
- - bugs: https://lists.sourceforge.net/lists/listinfo/freeglut-bugs
- - announce: https://lists.sourceforge.net/lists/listinfo/freeglut-announce
-
-  You need to subscribe before posting to any of our mailing lists. Make sure
-  to avoid selecting "daily digest mode" if you intend to post, so that you can
-  reply properly to specific messages. Also, please do not top-post, and try to
-  send properly formated emails (text, hard-wrapped at 72 columns, no binary or
-  large attachements).

_service:tar_scm:freeglut-3.0.0.tar.gz/android/gles2 Deleted

_service:tar_scm:freeglut-3.0.0.tar.gz/doc Deleted

_service:tar_scm:freeglut-3.0.0.tar.gz/doc/download.html Deleted

@@ -1,42 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="author" content="Pawel W. Olszta">
- <meta name="copyright" content="Pawel W. Olszta">
- <meta name="description" content="The downloads page">
- <meta name="keywords" content="freeglut glut OpenGL">
- <meta name="GENERATOR" content="WebMaker">
- <title>The freeglut project</title>
-</head>
-<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
-
-<center><img SRC="freeglut_logo.png" ALT="The freeglut logo" height=106 width=314></center>
-
-<center><dt>
-I upload it, you download it. That's the ying-yang nature of the Buddha.
-</dt></center>
-
-<center><table WIDTH="620"><tr><td><hr WIDTH="100%">
-
-January the 16th, 2000
-Here is a list of files you can download:
-
-
-<ul>
-<li>
- <a href="freeglut-1.3-alpha-2000-01-04.tar.gz">
- freeglut-1.3-alpha-2000-01-04.tar.gz</a> (approx. 210kB)
-<li>
- <a href="freeglut-1.3-alpha-2000-01-06.tar.gz">
- freeglut-1.3-alpha-2000-01-06.tar.gz</a> (approx. 220kB)
-<li>
- <a href="freeglut-1.3-alpha-2000-01-09.tar.gz">
- freeglut-1.3-alpha-2000-01-09.tar.gz</a> (approx. 230kB)
-<li>
- <a href="freeglut-1.3-alpha-2000-01-16.tar.gz">
- freeglut-1.3-alpha-2000-01-16.tar.gz</a> (approx. 230kB)
-</ul>
-
-</table></center></body></html>
-

_service:tar_scm:freeglut-3.0.0.tar.gz/doc/freeglut.html Deleted

@@ -1,163 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="author" content="Pawel W. Olszta">
- <meta name="copyright" content="Pawel W. Olszta">
- <meta name="description" content="A bit about me and the freeglut project">
- <meta name="keywords" content="freeglut glut OpenGL">
- <meta name="GENERATOR" content="WebMaker">
- <title>The freeglut project</title>
-</head>
-<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
-
-<center><img SRC="freeglut_logo.png" ALT="The freeglut logo" height=106 width=314></center>
-
-<center><dt>
-I am best at what I do worst and for this gift I feel blessed...
-</dt></center>
-
-<center><table WIDTH="620"><tr><td><hr WIDTH="100%">
-
-January the 2nd, 2000
-
-The alpha version has been released yesterday. Today I have been busy with moving 
-the project site to the <a href="http://www.sourceforge.net">SourceForge</a>. As for 
-now there will be the web site available and I will give it a try to set up the 
-freeglut mailing lists. There will be no CVS access available for now (my dialup 
-internet connection sucks so badly that I wouldn't be able to work on the project). 
-After I am done with that, I will try announcing the project on www.opengl.org.
-
-Of other things, there has been rumours floating round the routers and hubs about 
-Mark Kilgard changing the GLUT's license, but this is unconfirmed. It would be really 
-cool if he did so, there's no better motivation to work than a bit of sound competition.
-As for me, I already put too much work into the freeglut project to terminate it just 
-now. We'll see what happens next.
-
-January the 4th, 2000
-
-Ho-ho-ho. Freeglut-1.3 works fine with `Tux the Penguin and the Quest for Herring'.
-At least that's what Steve Baker, the author, says. Not only that, Steve has provided
-us with the joystick code (from his great PLIB project) and numerous hints and tips 
-about making freeglut more useful (I will try to put the results of our discussion
-on the <a href="structure.html">structure page</a>).
-
-As for other issues -- I promise I will start the Win32 port this weekend.
-BTW. -- is there a decent cross compiler for Linux that generates Win32 executables,
-so that I don't have to use windows for development? And what about Wine OpenGL
-support?
-
-The package is now some 40kB smaller than the previous one. Did some general
-clean ups, removed unnecessary configure scripts in the genfonts directory,
-the configure cahce, the Makefiles and so on. Also, I have started introducing 
-the new internal structure, as described <a href="structure.html">here</a>.
-
-January the 6th, 2000
-
-The missing glutInit() issue seems to be solved. Chris Purnell (fxGLUT author) says 
-that the GLUT window and menu creation functions call glutInit() if the caller didn't 
-do that before.
-
-The enumerations for GLUT_KEY_UP and GLUT_KEY_RIGHT were accidentally swapped.
-They should be OK now. Hope the rest is OK :)
-
-Added two new API calls to freeglut-1.3 -- glutBitmapHeight() and glutStrokeHeight(),
-as suggested by Steve Baker. This won't break the GLUT compatibility a lot, and I've
-heard it can be useful. Here you go.
-
-The <a href="structure.html">structure</a> plans page has been updated. The numerous
-feature hints from opengl-gamedev-l readers have been added.
-
-Somebody (Chris?) hinted me that the stroke fonts can be found in the XFree86
-sources. I browsed through it and -- presto. Now I only need to define the stroke fonts
-structure (should be very similar to bitmapped one) and write quite a simple parser.
-
-I've spent the (late) evening doing the init display string parsing and making
-my logics classes homework :) Both is harder than I primarily thought, but fortunately
-for me I can commit errors in one of those tasks. Guess which one? Argh. :)
-
-January the 8th, 2000
-
-First of all, both the missing glutInit() and glutGet(GLUT_WINDOW_X|Y) issues are 
-fixed now. The first problem was solved thanks to Chris Purnell, who showed me the way 
-GLUT dealt with the problem. Good for me there's someone who reads it's source code (I 
-just felt it would be unfair for me to do so :D). The second problem was solved by 
-adding a XMoveWindow call just after the window creation and initial mapping. This is 
-strange. Maybe one of the Xlib calls between the creation and mapping spoiled the 
-window's coordinates?
-
-This makes even more GLUT tests work fine. The tests can be found in any decent
-GLUT 3.7 distribution. Following tests produce a FAIL message: test18.c (some layer
-issues), test19.c (see the GLUT_NORMAL_DAMAGED issue on the progress page), test22.c
-(window stacking/visibilty problems), test23.c (glutInitDisplayString() is unfinished),
-test25.c (the freeglut fonts differ a bit from GLUT's), test28.c (-iconic handling
-is missing(?)). Gee :)
-
-I've spent another hour doing the glutInitDisplayString(), but it still is far from 
-being complete. And I've also started gathering information on doing the game mode
-stuff. The video mode enumeration in both cases will be painful.
-
-There is a big issue with the window contents redrawing. Right now, it is forced
-every time there are no events pending in the main loop. I know it's wrong, but it
-without such an approach some of the test programs freeze soon after starting. Could
-someone peer-review the main loop code please?
-
-I have decided to start the Win32 port this weekend. As for now, the code compiles
-under vc++5.0. I will start making it work as soon as I download the pthreads library 
-and the newest version of GLib for Windows. It was quite a good idea to start the port,
-as the Microsoft's compiler generates much more warnings and I had quite a few things 
-fixed for free.
-
-January the 9th, 2000
-
-Doing the Win32 port all the day... Actually, there is enough code to make it work,
-however I am sure only of that it compiles (more or less). I need to download the
-pthreads-win32 library to get the GLib working first, and somehow I was unable to
-do it during the weekend. Once again -- the Win32 port does not work yet. Oh, and
-I need adding the __declspec(dllexport) thing...
-
-After it starts working, I'll have to clean up the code a bit, I guess...
-
-January the 10th, 2000
-
-Here I am at three o'clock am, half-awake, uploading and downloading things for 
-freeglut. I never thought I'd be able to force myself getting up that early :)
-
-January the 16th, 2000
-
-Both the flu and a terrible feeling about the dialup bills made me slow down
-a bit, the internet activity I mean :). But here I am again uploading the latest
-snapshot. The biggest news about it is the Win32 port working, with nearly all 
-features you can find in the X11 version implemented (still, it needs some debugging). 
-For the Unix port, game mode support (loosely based on SDL source code posted at Neal 
-Tringham's www.pseudonymz.demon.co.uk) and numerous bug fixes have been introduced.
-
-In order to compile the Win32 version, you'll need pthreads-win32 library (see 
-sourceware.cygnus.org), the GLib-1.2.x (www.gtk.org, I've been using the 1.2.6),
-a working native compiler (Microsoft VisualC++ 5.0 in my case), and a bit of patience.
-See the project files I've supplied for some definitions needed (FREEGLUT_LIBRARY_BUILD
-needs to be declared when building the DLL), and don't forget freeglut joystick code
-is making use of Win32 multimedia extensions (link against winmm.lib).
-
-Be prepared to meet the fact Mesa 3.1 (or at least my compilation) doesn't work very
-well with this snapshot -- something's messed up when changing WGL contexts. This is
-really strange, as the Microsoft's OpenGL works pretty fine, as does Dominik Behr's 
-miniGL thing. The assumption is that I've taken some approach that somehow is valid
-with Microsoft's drivers, but is not OpenGL conformant. Could anyone check this out 
-please? 
-
-My plan for next week is to add some lesser features missing, and start learning
-maths as the session at my university is coming in really fast :) This way or another,
-expect the next release not any sooner than next weekend (given that no nasty bugs get
-digged out).
-
-Argh. Don't be surprised if the code doesn't compile under X-11 other than XFree86.
-It could fail when trying to include the X11/extensions/xf86vmode.h include header,
-in that case just comment out that inclusion line (found in freeglut_internal.h).
-Is there any intelligent way to detect the existence of an include header, and if
-it's autoconf to be the answer, how to use it?
-
- <a href="index.html">Back to the main page</a>
-
-</table></center></body></html>
-

_service:tar_scm:freeglut-3.0.0.tar.gz/doc/freeglut_logo.png Deleted

_service:tar_scm:freeglut-3.0.0.tar.gz/doc/freeglut_user_interface.html Deleted

@@ -1,1956 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- 
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- 
- <meta name="Author" content="John F. Fay">
- 
- <meta name="GENERATOR" content="Mozilla/4.77 en (Windows NT 5.0; U) Netscape">
- <title>FREEGLUT Application Program Interface</title>
-</head>
- <body>
- 
-<dl>
-<center> 
-<h1> The Open-Source</h1>
- </center>
-<center> 
-<h1> OpenGL Utility Toolkit</h1>
- </center>
-<center> 
-<h1> (freeglut 2.0.0)</h1>
- </center>
-<center> 
-<h1> Application Programming Interface</h1>
- </center>
-</dl>
- 
-<center> 
-<h1> Version 4.0</h1>
- </center>
- 
-<center> 
-<h2> The freeglut Programming Consortium</h2>
- </center>
- 
-<center> 
-<h2> July, 2003</h2>
- </center>
- 
- 
- OpenGL is a trademark of Silicon Graphics, Inc. X Window System is a trademark 
-of X Consortium, Inc.&nbsp; Spaceball is a registered trademark of Spatial 
-Systems Inc. 
- The authors have taken care in preparation of this documentation but make 
-no expressed or implied warranty of any kind and assumes no responsibility
- for errors or omissions. No liability is assumed for incidental or consequential
- damages in connection with or arising from the use of information or programs
- contained herein. 
- &nbsp; 
- 
-<h1> 1.0&nbsp;<a name="Contents"></a>
- Contents</h1>
- 1.0&nbsp; <a href="#Contents">Contents</a>
- 
-2.0&nbsp; <a href="#Introduction">Introduction</a>
- 
- 
-3.0&nbsp; <a href="#Background">Background</a>
- 
- 
-<blockquote>3.1&nbsp; Design Philosophy 
- 3.2&nbsp; Conventions 
- 3.3&nbsp; Terminology 
- 3.4&nbsp; Differences from GLUT 3.7</blockquote>
- 
- 
- 4.0&nbsp; <a href="#Initialization">Initialization Functions</a>
- 
- 
- <blockquote>4.1&nbsp; glutInit 
- 4.2&nbsp; glutInitWindowPosition, glutInitWindowSize 
- 4.3&nbsp; glutInitDisplayMode 
- 4.4&nbsp; glutInitDisplayString</blockquote>
- 
- 
- 5.0&nbsp; <a href="#EventProcessing">Event Processing Functions</a>
- 
- 
- <blockquote>5.1&nbsp; glutMainLoop 
- 5.2&nbsp; glutMainLoopEvent 
- 5.3&nbsp; glutLeaveMainLoop</blockquote>
- 
- 
- 6.0&nbsp; <a href="#Window">Window Functions</a>
- 
- 
- <blockquote>6.1&nbsp; glutCreateWindow 
- 6.2&nbsp; glutCreateSubwindow 
- 6.3&nbsp; glutDestroyWindow 
- 6.4&nbsp; glutSetWindow, glutGetWindow 
- 6.5&nbsp; glutSetWindowTitle, glutSetIconTitle 
- 6.6&nbsp; glutReshapeWindow 
- 6.7&nbsp; glutPositionWindow 
- 6.8&nbsp; glutShowWindow, glutHideWindow, glutIconifyWindow 
- 6.9&nbsp; glutPushWindow, glutPopWindow 
- 6.10&nbsp; glutFullScreen</blockquote>
- 
- 
- 7.0&nbsp; <a href="#Display">Display Functions</a>
- 
- 
- <blockquote>7.1&nbsp; glutPostRedisplay 
- 7.2&nbsp; glutPostWindowRedisplay 
- 7.3&nbsp; glutSwapBuffers</blockquote>
- 
- 
- 8.0&nbsp; <a href="#MouseCursor">Mouse Cursor Functions</a>
- 
- 
- <blockquote>8.1&nbsp; glutSetCursor 
- 8.2&nbsp; glutWarpPointer</blockquote>
- 
- 
- 9.0&nbsp; <a href="#Overlay">Overlay Functions</a>
- 
- 
- <blockquote>9.1&nbsp; glutEstablishOverlay 
- 9.2&nbsp; glutRemoveOverlay 
- 9.3&nbsp; glutUseLayer 
- 9.4&nbsp; glutPostOverlayRedisplay 
- 9.5&nbsp; glutPostWindowOverlayRedisplay 
- 9.6&nbsp; glutShowOverlay, glutHideOverlay</blockquote>
- 
- 
- 10.0&nbsp; <a href="#Menu">Menu Functions</a>
- 
- 
- <blockquote>10.1&nbsp; glutCreateMenu 
- 10.2&nbsp; glutDestroyMenu 
- 10.3&nbsp; glutGetMenu, glutSetMenu 
- 10.4&nbsp; glutAddMenuEntry 
- 10.5&nbsp; glutAddSubMenu 
- 10.6&nbsp; glutChangeToMenuEntry 
- 10.7&nbsp; glutChangeToSubMenu 
- 10.8&nbsp; glutRemoveMenuItem 
- 10.9&nbsp; glutAttachMenu, glutDetachMenu</blockquote>
- 
- 
- 11.0&nbsp; <a href="#GlobalCallback">Global Callback Registration Functions</a>
- 
- 
- <blockquote>11.1&nbsp; glutTimerFunc 
- 11.2&nbsp; glutIdleFunc</blockquote>
- 
- 
- 12.0&nbsp; <a href="#WindowCallback">Window-Specific Callback Registration
- Functions</a>
- 
- 
- <blockquote>12.1&nbsp; glutDisplayFunc 
- 12.2&nbsp; glutOverlayDisplayFunc 
- 12.3&nbsp; glutReshapeFunc 
- 12.4&nbsp; glutCloseFunc 
- 12.5&nbsp; glutKeyboardFunc 
- 12.6&nbsp; glutSpecialFunc 
- 12.7&nbsp; glutKeyboardUpFunc 
- 12.8&nbsp; glutSpecialUpFunc 
- 12.9&nbsp; glutMouseFunc 
- 12.10&nbsp; glutMotionFunc, glutPassiveMotionFunc 
- 12.11&nbsp; glutVisibilityFunc 
- 12.12&nbsp; glutEntryFunc 
- 12.13&nbsp; glutJoystickFunc 
- 12.14&nbsp; glutSpaceballMotionFunc 
- 12.15&nbsp; glutSpaceballRotateFunc 
- 12.16&nbsp; glutSpaceballButtonFunc 
- 12.17&nbsp; glutButtonBoxFunc 
- 12.18&nbsp; glutDialsFunc 
- 12.19&nbsp; glutTabletMotionFunc 
- 12.20&nbsp; glutTabletButtonFunc 
- 12.21&nbsp; glutMenuStatusFunc 
- 12.22&nbsp; glutWindowStatusFunc
- </blockquote>
- 
- 
- 13.0&nbsp; <a href="#StateSetting">State Setting and Retrieval Functions</a>
- 
- 
- <blockquote>13.1&nbsp; glutSetOption 
- 13.2&nbsp; glutGet 
- 13.3&nbsp; glutDeviceGet 
- 13.4&nbsp; glutGetModifiers 
- 13.5&nbsp; glutLayerGet 
- 13.6&nbsp; glutExtensionSupported 
-13.7 &nbsp;glutGetProcAddress 
- </blockquote>
- 
- 
- 14.0&nbsp; <a href="#FontRendering">Font Rendering Functions</a>
- 
- 
- <blockquote>14.1&nbsp; glutBitmapCharacter 
- 14.2&nbsp; glutBitmapString 
- 14.3&nbsp; glutBitmapWidth 
- 14.4&nbsp; glutBitmapLength 
- 14.5&nbsp; glutBitmapHeight 
- 14.6&nbsp; glutStrokeCharacter 
- 14.7&nbsp; glutStrokeString 
- 14.8&nbsp; glutStrokeWidth

_service:tar_scm:freeglut-3.0.0.tar.gz/doc/index.html Deleted

@@ -1,101 +0,0 @@
-<html>
-<head>
-<title>The freeglut project</title>
-</head>
-<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
-
-<table>
-<tr>
-<td>
-
-<center><img SRC="freeglut_logo.png" ALT="The freeglut logo"></center>
-<center> The free OpenGL utility toolkit </center>
-
-</td>
-<td>
-
-<center><a href="http://sourceforge.net">
-<img src="http://sourceforge.net/sflogo.php?group_id=0&type=1" border="0">
-</a></center> 
-<center>Hosted at SourceForge</center>
-</td>
-</tr>
-</table>
-
-<hr>
-
-<ul>
-
-<li>What
-
-freeglut is a completely OpenSourced alternative to the OpenGL Utility
-Toolkit (GLUT) library. GLUT was originally written by Mark Kilgard
-to support the sample programs in the second edition OpenGL 'RedBook'.
-Since then, GLUT has been used in a wide variety of practical applications
-because it is simple, universally available and highly portable.
-
-GLUT (and hence freeglut) allows the user to create and manage
-windows containing OpenGL contexts on a wide range of platforms and
-also read the mouse, keyboard and joystick functions.
-
-freeglut is released under the X-Consortium license.
-
-
-<li>Why
-
-The original GLUT library seems to have been abandoned with the most
-recent version (3.7) dating back to August 1998. It's license does
-not allow anyone to distribute modified the library code. This would
-be OK, if not for the fact that GLUT is getting old and really needs
-improvement. Also, GLUT's license is incompatible with some software
-distributions (eg Xfree86).
-
-
-<li>Who
-
-freeglut was originally written by Pawel W. Olszta with contributions
-from Andreas Umbach and Steve Baker. Steve is now the official
-owner/maintainer of freeglut.
-
-
-<li>When
-
-Pawel started freeglut development on December 1st, 1999.
-The project is now a virtually 100% replacement for the original
-GLUT with only a few departures (such as the abandonment of SGI-specific
-features such as the Dials&Buttons box and Dynamic Video Resolution).
-
-
-<li>Downloads
-
-Check the <a href="download.html"> 
-downloads page</a> for the latest release.
-
-
-<li>Support
-
-Send freeglut related questions to the appropriate freeglut mailing list:
-<ul>
-<li><a href="mailto:freeglut-developer@lists.sourceforge.net">freeglut-developer</a>, 
-<li><a href="mailto:freeglut-announce@lists.sourceforge.net">freeglut-announce</a> and 
-<li><a href="mailto:freeglut-bugs@lists.sourceforge.net">freeglut-bugs</a>.
-</ul>
-You can subscribe to them via the
- <a href="http://sourceforge.net/project/?group_id=1032">
-SourceForge project interface</a>.
-
-
-<li>Documentation
-
-I believe this is enough for a short introduction.
-If you are not tired of reading yet, check out the
-<a href="freeglut.html">freeglut project log</a>. Here you will find the
-yet-to-be-introduced new project <a href="structure.html">structure
-description</a>. Finally, here you will find the latest
-<a href="progress.html">work progress report</a>. Since freeglut is
-a re-implementation of the original GLUT API, you can find API
-documentation at <A HREF="http://www.opengl.org">http://www.opengl.org</A>.
-
-</ul>
-</body></html>
-

_service:tar_scm:freeglut-3.0.0.tar.gz/doc/ogl_sm.png Deleted

_service:tar_scm:freeglut-3.0.0.tar.gz/doc/progress.html Deleted

@@ -1,137 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="author" content="Pawel W. Olszta">
- <meta name="copyright" content="Pawel W. Olszta">
- <meta name="description" content="The freeglut development progress reports">
- <meta name="keywords" content="freeglut glut OpenGL">
- <meta name="GENERATOR" content="WebMaker">
- <title>The freeglut project</title>
-</head>
-<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
-
-<center><img SRC="freeglut_logo.png" ALT="The freeglut logo" height=106 width=314></center>
-<center><dt>
-I love reports. They are so full of brightness and hope...
-</dt></center>
-
-<center><table WIDTH="620" ><tr><td><hr WIDTH="100%">
-
-January the 16th, 2000
-
-It looks like both X11 and Win32 version have reached a comparable usability stage.
-They are still missing many GLUT API 3 features, but the number is getting smaller and
-smaller every day :)
-
- <ul><li>input devices</li>
-
-Keyboard and mouse seems to work well. There is a big guess about the mouse buttons 
-count under X11 (always 3) -- I must remember to correct the menu activation code if 
-this shows to be invalid.
-
-None of the bizarre input devices found in GLUT API is supported (and probably won't). 
-
-Steve Baker contributed the joystick code. It should work fine, as it did in PLIB,
-but I haven't tested it out yet. It might not compile under FreeBSD, as I had to 
-convert it from C++ to C and had no possibility to compile it under FreeBSD (the Win32
-version had some typos, but I've already fixed them).
-
- <li>pull-down menus</li>
-
-Pull down menus seem to work. The menu is displayed using OpenGL, so it requires 
-the window's contents to be refreshed at an interactive rate, which sometimes does not 
-happen. That's why I'll consider adding optional window-system menu navigation later. 
-For now -- extensive testing is what I believe should be done with the menu system.
-
- <li>fonts</li>
-
-Bitmap fonts support is done. However it would be good to add two more API functions
--- glutBitmapString() and glutStrokeString(), which should limit the quantity of state
-changes when drawing longer strings. 
-
-Good that somebody finally told me where to get the stroke fonts data from... XFree86
-sources contain the ROMAN and MONO ROMAN stroke fonts data. For now stroke fonts are 
-rendered using the bitmap font GLUT_BITMAP_8_BY_13.
-
-What has changed is the way the fonts are specified. I moved to the GLUT's strange
-way of supplying (fake for freeglut) font data pointers instead of some nice enums.
-Hope it helps in achieving the binary compatibility between freeglut and GLUT.
-
-Added two new API calls: glutBitmapHeight() and glutStrokeHeight(), that return
-a font's height. Hope this doesn't break the GLUT compatibility a lot.
-
- <li>mouse cursor</li>
-
-Need to have own cursor shapes, so that freeglut can pass them to the windowing
-system, draw them using glBitmap() and/or texture mapping. The cursor shapes are very
-probable to be found in XFree86 sources.
-
- <li>indexed color mode</li>
-
-This might work, however I have not tested it yet. glutGetColor/glutSetColor is not 
-implemented. Again, looks like a single Xlib call, but there might be some problems 
-with the colormap access. Need to switch into indexed color mode some day and check it 
-out (does Mesa 3.1 work with indexed color mode?)
-
- <li>planes</li>
-
-Overlays are not supported, but one of the GLUT conformance tests fails due to 
-glutLayerGet( GLUT_NORMAL_DAMAGED ) returning FALSE when the window has actually 
-been damaged.
-
-Layers would be good for drawing the menus and mouse cursor, as they wouldn't force
-the application redraw to update their state.
-
- <li>init display string</li>
-
-I am in middle of the fight with the init display string. It's parsing OK, now it 
-would be cool to make it impress some effects on the display... 
-
- <li>game mode</li>
-
-Is the game mode string parsed correctly?
-
- <li>geometry</li>
-
-Andreas Umbach has contributed the cube and sphere code. The teapot rendering is 
-done using free SGI code. I have also added the cone rendering, however it is missing 
-normal vectors (just as Andrea's wireframed cube does). All of the glut*hedron() 
-functions await to be implemented.
-
- <li>obvious bugs</li>
-
- <ol>
-<li>
-the visibility/window status function is a conceptual mess. I had to peer into the GLUT
-source code to see what actually happens inside. It helped me a bit, but still one of 
-the visibility tests fails. This is probably the reason for which a window covered by 
-enlightenment status bar is marked as hidden and does not get redrawn.</li>
-
-<li>
-GLX 1.3 spec states that glXChooseVisual() et consortes are deprecated. Should move to 
-glXFBConfig.</li>
-
-<li>
-need to investigate what happens when initial window position is set to (-1,-1). GLUT 
-specification says, that the window positioning should be left to the window system. 
-And I do not know how to force it do so...</li>
-
-<li>
-I was told it is wrong to have the redisplay forced in the main loop. Is that right?</li>
-
-</ol> <li>not so obvious bugs</li>
-
- <ol>
-<li>some of the tests freeze because they do not generate the glutPostRedisplay() call 
-every frame. Again, this is somehow handled by GLUT, but I can't see how. And why.
-
-Looks like I've fixed it (or rather hacked it?) by forcing a redisplay every
-frame, but this is no good and kills interactiveness of my console :D</li>
-
-</ol></ul>
-
-<a href="index.html">Back to the main page</a>
-
-</table></center></body></html>
-

_service:tar_scm:freeglut-3.0.0.tar.gz/doc/structure.html Deleted

@@ -1,80 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="author" content="Pawel W. Olszta">
- <meta name="copyright" content="Pawel W. Olszta">
- <meta name="description" content="The freeglut project plans">
- <meta name="keywords" content="freeglut glut OpenGL">
- <meta name="GENERATOR" content="WebMaker">
- <title>The freeglut project</title>
-</head>
-<body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000">
-
-<center><img SRC="freeglut_logo.png" ALT="The freeglut logo" height=106 width=314></center>
-<center><dt>
-I've got a master plan (to take your API down)...
-</dt></center>
-
-<center><table WIDTH="620" ><tr><td><hr WIDTH="100%">
-
-After that I get the freeglut Windows port working in an acceptable manner and thus 
-getting assured that the freeglut internal structure is valid, I will split the project
-into three separate parts, listed below.
-
- <ul><li>freeglut-common</li>
-
-The least common denominator between the two freeglut versions. This will probably 
-contain most of the internal structure of the toolkit, notably the windows and menu 
-hierarchy, and possibly some private helpers.
-
- <li>freeglut-1.3</li>
-
-The GLUT API 3 compatible library. This is what's can be found now in the alpha 
-release (apart from the bugs, naturally :D).
-
- <li>freeglut-2.0</li>
-
-Hopefully this will be what GLUT should have been from the beginning. I will give 
-a try to design a much more coherent API than GLUT's, aiming at fast games prototyping.
-<a href="mailto:olszta@sourceforge.net">Suggestions</a> are welcome.</ul>
-
- Here's a list of propositions I have received so far. Hopefully this some day 
-turns into an API spefication proposal, not just a bunch of meaningless phrases... 
-
- <li>glutBitmapHeight() and glutStrokeHeight() -- I have added them to the 
-freeglut-1.3 API, they are already implemented and should work fine,</li>
- <li>glutBitmapString() and glutStrokeString(), to write (multiple-line maybe)
-strings, starting from the current raster position, using some simple formatting
-maybe (changing the color, font, etc.?)</li>
- <li>texture mapped fonts -- this is easy and could be added to freeglut-1.3, but 
-would require adding the...</li>
- <li>glutHint() function to tell freeglut to: use bitmapped/texture mapped fonts, 
-draw the menus and mouse cursor using OpenGL/window system, and stuff...</li>
- <li>glutMainLoop() termination and glutMainLoopStep() function, which should 
-perform a single check of pending events, so that one can have his own main loop,</li>
- <li>multiple joysticks support with multiple axes, buttons, hats, etc. It is a real
-good thing to do, yet the API to do the magic might result in being really twisted,</li>
- <li>glutModifierFunc() could be added, or glutGetModifierState() should be allowed
-to be called anywhere from the client's code</li>
-
- We might also think about: 
-
- <li>freeglut-2.0 modularity via plugins, so that only the features that one 
-needs get loaded (plugins are easily supported by GLib),</li>
- <li>OpenGL state management functions,</li>
- <li>audio support -- using OpenAL maybe?,</li>
- <li>a real menu system, not only the popups</li>
- <li>non-OpenGL but portable UI, something like Java Swing</li>
- <li>window-closing confirmation box (this is related to the above)</li>
-
- Following ideas are bad for freeglut: 
-
- <li>more accurate timers under Win32 -- this goes to the GLib development afaik</li>
- <li>portable file I/O, portable threads, plugins/modules -- this is already
-done in GLib</li>
-
- <a href="index.html">Back to the main page</a>
-
-</table></center></body></html>
-

_service:tar_scm:freeglut-3.0.0.tar.gz/progs/demos/Resizer Deleted

_service:tar_scm:freeglut-3.0.0.tar.gz/progs/demos/Resizer/Resizer.cpp Deleted

@@ -1,383 +0,0 @@
-#include <stdio.h>
-
-#include <GL/freeglut.h>
-
-int nWindow, nChildWindow = -1;
-int nLoopMain = 0;
-GLboolean bChildPosDone = GL_FALSE, bChildSizeDone = GL_FALSE;
-
-void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY );
-void Redisplay();
-void Reshape(int width, int height);
-void Position(int x, int y);
-void WindowStatus(int state);
-
-
-
-
-void DrawQuad()
-{
- int width = glutGet(GLUT_WINDOW_WIDTH);
- int height = glutGet(GLUT_WINDOW_HEIGHT);
-
- glBegin(GL_QUADS);
- glVertex2d(width*.25, height*.75);
- glVertex2d(width*.75, height*.75);
- glVertex2d(width*.75, height*.25);
- glVertex2d(width*.25, height*.25);
- glEnd();
-}
-
-void UnhideTimer(int window)
-{
- glutSetWindow(window);
- glutShowWindow();
-}
-
-void ChangeTitleTimer(int unused)
-{
- glutSetIconTitle("new icon title");
- glutSetWindowTitle("new test title");
-}
-
-void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY )
-{
- switch (cChar)
- {
- case 27:
- glutLeaveMainLoop();
-
- break;
-
-
- case 'f':
- case 'F':
- printf("main window toggle fullscreen\n");
- glutFullScreenToggle();
-
- break;
-
-
- case 'r':
- case 'R':
- if (nChildWindow!=-1 && cChar=='r') /* Capital R always resizes the main window*/
- {
- glutSetWindow(nChildWindow);
- printf("child window resize\n");
- if (!bChildSizeDone)
- glutReshapeWindow(glutGet(GLUT_WINDOW_WIDTH)+50,glutGet(GLUT_WINDOW_HEIGHT)+50);
- else
- glutReshapeWindow(glutGet(GLUT_WINDOW_WIDTH)-50,glutGet(GLUT_WINDOW_HEIGHT)-50);
- bChildSizeDone = !bChildSizeDone;
- }
- else
- {
- glutSetWindow(nWindow);
- printf("main window resize\n");
- if (glutGet(GLUT_WINDOW_WIDTH)<400)
- glutReshapeWindow(600,300);
- else
- glutReshapeWindow(300,300);
- }
-
- break;
-
-
- case 'm':
- case 'M':
- if (nChildWindow!=-1 && cChar=='m') /* Capital M always moves the main window*/
- {
- glutSetWindow(nChildWindow);
- /* The window position you request is relative to the top-left
- * corner of the client area of the parent window.
- */
- if (!bChildPosDone)
- glutPositionWindow(glutGet(GLUT_WINDOW_X)+50,glutGet(GLUT_WINDOW_Y)+50);
- else
- glutPositionWindow(glutGet(GLUT_WINDOW_X)-50,glutGet(GLUT_WINDOW_Y)-50);
- bChildPosDone = !bChildPosDone;
- }
- else
- {
- glutSetWindow(nWindow);
- printf("main window position\n");
- /* The window position you request is the outer top-left of the window,
- * the client area is at a different position if the window has borders
- * and/or a title bar.
- */
- if (glutGet(GLUT_WINDOW_X)<400)
- glutPositionWindow(600,300);
- else
- glutPositionWindow(300,300);
- }
-
- break;
-
-
- case 'd':
- case 'D':
- if (nChildWindow!=-1 && cChar=='d') /* Capital D always moves+resizes the main window*/
- {
- glutSetWindow(nChildWindow);
- if (!bChildPosDone)
- glutPositionWindow(glutGet(GLUT_WINDOW_X)+50,glutGet(GLUT_WINDOW_Y)+50);
- else
- glutPositionWindow(glutGet(GLUT_WINDOW_X)-50,glutGet(GLUT_WINDOW_Y)-50);
- bChildPosDone = !bChildPosDone;
- if (!bChildSizeDone)
- glutReshapeWindow(glutGet(GLUT_WINDOW_WIDTH)+50,glutGet(GLUT_WINDOW_HEIGHT)+50);
- else
- glutReshapeWindow(glutGet(GLUT_WINDOW_WIDTH)-50,glutGet(GLUT_WINDOW_HEIGHT)-50);
- bChildSizeDone = !bChildSizeDone;
- }
- else
- {
- if (glutGet(GLUT_WINDOW_X)<400)
- glutPositionWindow(600,300);
- else
- glutPositionWindow(300,300);
- if (glutGet(GLUT_WINDOW_WIDTH)<400)
- glutReshapeWindow(600,300);
- else
- glutReshapeWindow(300,300);
- }
- break;
-
-
- case 'c':
- case 'C':
- if (nChildWindow==-1)
- {
- int width = glutGet(GLUT_WINDOW_WIDTH);
- int height = glutGet(GLUT_WINDOW_HEIGHT);
-
- /* open child window */
- printf("open child window\n");
-
- nChildWindow = glutCreateSubWindow(nWindow,(int)(width*.35),(int)(height*.35),(int)(width*.3),(int)(height*.3));
- glutKeyboardFunc( SampleKeyboard );
- glutDisplayFunc( Redisplay );
- glutReshapeFunc( Reshape );
- glutPositionFunc( Position );
- glutWindowStatusFunc( WindowStatus );
- }
- else
- {
- /* close child window */
- printf("close child window\n");
- glutSetWindow(nWindow);
- glutDestroyWindow(nChildWindow);
- nChildWindow = -1;
- bChildSizeDone = GL_FALSE;
- bChildPosDone = GL_FALSE;
- }
- break;
-
-
- case 'i':
- case 'I':
- glutIconifyWindow();
- glutTimerFunc(1500, ChangeTitleTimer, 0);
- break;
-
-
- case 'h':
- case 'H':
- if (nChildWindow!=-1 && cChar=='h') /* Capital H always hides the main window*/
- {
- glutSetWindow(nChildWindow);
- glutTimerFunc(2000, UnhideTimer, nChildWindow);
- }
- else
- {
- glutSetWindow(nWindow);
- glutTimerFunc(2000, UnhideTimer, nWindow);
- }
- glutHideWindow();
- break;
-
- case 'p':

_service:tar_scm:freeglut-3.0.0.tar.gz/src/osx Deleted

_service:tar_scm:freeglut-3.4.0.tar.gz/.github Added

_service:tar_scm:freeglut-3.4.0.tar.gz/.github/workflows Added

_service:tar_scm:freeglut-3.4.0.tar.gz/.github/workflows/build_gnulinux_x11.yml Added

_service:tar_scm:freeglut-3.4.0.tar.gz/.github/workflows/build_macosx_x11.yml Added

_service:tar_scm:freeglut-3.4.0.tar.gz/.github/workflows/build_win_msvc.yml Added

_service:tar_scm:freeglut-3.0.0.tar.gz/.gitignore -> _service:tar_scm:freeglut-3.4.0.tar.gz/.gitignore Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/AUTHORS -> _service:tar_scm:freeglut-3.4.0.tar.gz/AUTHORS Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/CMakeLists.txt -> _service:tar_scm:freeglut-3.4.0.tar.gz/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
-PROJECT(freeglut)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)
+PROJECT(freeglut C)
 
 # for multiarch LIBDIR support (requires cmake>=2.8.8)
 INCLUDE(GNUInstallDirs)
@@ -16,18 +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 0)
+set(VERSION_MINOR 4)
 set(VERSION_PATCH 0)
+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 10)	# increment on backwards compatible or internal changes
-set(SO_REV 0)		# if nothing else changed increment this
+set(SO_MINOR 12)	# increment on backwards compatible API additions
+set(SO_REV 0)		# 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.
@@ -50,20 +51,36 @@
 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(NOT WIN32)
+IF(WIN32)
+    OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" OFF)
+ELSE()
     OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON)
 ENDIF()
 
+IF(NOT WIN32)
+    # Wayland support
+    OPTION(FREEGLUT_WAYLAND "Use Wayland (no X11)" OFF)
+ENDIF()
+
 
 SET(FREEGLUT_HEADERS
     include/GL/freeglut.h
+    include/GL/freeglut_ucall.h
     include/GL/freeglut_ext.h
     include/GL/freeglut_std.h
-    include/GL/glut.h
 )
+IF(FREEGLUT_REPLACE_GLUT)
+    LIST(APPEND FREEGLUT_HEADERS
+        include/GL/glut.h
+    )
+ENDIF()
 SET(FREEGLUT_SRCS
     ${FREEGLUT_HEADERS}
     src/fg_callbacks.c
@@ -78,6 +95,7 @@
     src/fg_init.c
     src/fg_init.h
     src/fg_internal.h
+    src/fg_callback_macros.h
     src/fg_input_devices.c
     src/fg_joystick.c
     src/fg_main.c
@@ -121,6 +139,7 @@
         src/mswin/fg_state_mswin.c
         src/mswin/fg_structure_mswin.c
         src/mswin/fg_window_mswin.c
+	src/mswin/fg_cmap_mswin.c
         ${CMAKE_BINARY_DIR}/freeglut.rc # generated below from freeglut.rc.in
     )
     IF (MSVC AND NOT CMAKE_CL_64)
@@ -167,36 +186,61 @@
             src/blackberry/fg_window_blackberry.c
         )
     ENDIF()
+
 ELSE()
-    LIST(APPEND FREEGLUT_SRCS
-        src/x11/fg_cursor_x11.c
-        src/x11/fg_ext_x11.c
-        src/x11/fg_gamemode_x11.c
-        src/x11/fg_glutfont_definitions_x11.c
-        src/x11/fg_init_x11.c
-        src/x11/fg_internal_x11.h
-        src/x11/fg_input_devices_x11.c
-        src/x11/fg_joystick_x11.c
-        src/x11/fg_main_x11.c
-        src/x11/fg_menu_x11.c
-        src/x11/fg_spaceball_x11.c
-        src/x11/fg_state_x11.c
-        src/x11/fg_structure_x11.c
-        src/x11/fg_window_x11.c
-        src/x11/fg_xinput_x11.c
-    )
-    IF(NOT(FREEGLUT_GLES))
+    # UNIX (Wayland)
+    IF(FREEGLUT_WAYLAND)
         LIST(APPEND FREEGLUT_SRCS
-            src/x11/fg_internal_x11_glx.h
-            src/x11/fg_display_x11_glx.c
-            src/x11/fg_state_x11_glx.c
-            src/x11/fg_state_x11_glx.h
-            src/x11/fg_window_x11_glx.c
-            src/x11/fg_window_x11_glx.h
+            src/wayland/fg_cursor_wl.c
+            src/wayland/fg_ext_wl.c
+            src/wayland/fg_gamemode_wl.c
+            src/wayland/fg_init_wl.c
+            src/wayland/fg_internal_wl.h
+            src/wayland/fg_input_devices_wl.c
+            src/wayland/fg_main_wl.c
+            src/wayland/fg_state_wl.c
+            src/wayland/fg_structure_wl.c
+            src/wayland/fg_window_wl.c
+            # font, serial port & joystick code are agnostic
+            src/x11/fg_glutfont_definitions_x11.c
+            src/x11/fg_input_devices_x11.c
+            src/x11/fg_joystick_x11.c
         )
+    # UNIX (X11)
+    ELSE()
+        LIST(APPEND FREEGLUT_SRCS
+            src/x11/fg_cursor_x11.c
+            src/x11/fg_ext_x11.c
+            src/x11/fg_gamemode_x11.c
+            src/x11/fg_glutfont_definitions_x11.c
+            src/x11/fg_init_x11.c
+            src/x11/fg_internal_x11.h
+            src/x11/fg_input_devices_x11.c
+            src/x11/fg_joystick_x11.c
+            src/x11/fg_main_x11.c
+            src/x11/fg_menu_x11.c
+            src/x11/fg_spaceball_x11.c
+            src/x11/fg_state_x11.c
+            src/x11/fg_structure_x11.c
+            src/x11/fg_window_x11.c
+            src/x11/fg_xinput_x11.c
+	    src/x11/fg_cmap_x11.c
+        )
+        IF(NOT(FREEGLUT_GLES))
+            LIST(APPEND FREEGLUT_SRCS
+                src/x11/fg_internal_x11_glx.h
+                src/x11/fg_display_x11_glx.c
+                src/x11/fg_state_x11_glx.c
+                src/x11/fg_state_x11_glx.h
+                src/x11/fg_window_x11_glx.c
+                src/x11/fg_window_x11_glx.h
+            )
+        ENDIF()
     ENDIF()
 ENDIF()
-IF(FREEGLUT_GLES)
+
+# OpenGL ES requires EGL, and so does Wayland
+IF(FREEGLUT_GLES OR FREEGLUT_WAYLAND)
     LIST(APPEND FREEGLUT_SRCS
         src/egl/fg_internal_egl.h
         src/egl/fg_display_egl.c
@@ -212,18 +256,63 @@
     )
 ENDIF()
 
+INCLUDE(CheckIncludeFiles)
+IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND))
+    FIND_PACKAGE(X11 REQUIRED)
+    INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH})
+    LIST(APPEND LIBS ${X11_X11_LIB})
+    IF(X11_Xrandr_FOUND)
+        SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE)
+        LIST(APPEND LIBS ${X11_Xrandr_LIB})
+    ENDIF()
+    IF(X11_xf86vmode_FOUND)
+        SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE)
+        LIST(APPEND LIBS ${X11_Xxf86vm_LIB})
+    ENDIF()
+    IF(X11_Xinput_FOUND)
+        # Needed for multi-touch:
+        CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H)
+        LIST(APPEND LIBS ${X11_Xinput_LIB})
+    ELSE()
+        MESSAGE(FATAL_ERROR "Missing X11's XInput2.h (X11/extensions/XInput2.h)")
+    ENDIF()

_service:tar_scm:freeglut-3.0.0.tar.gz/ChangeLog -> _service:tar_scm:freeglut-3.4.0.tar.gz/ChangeLog Changed

@@ -1,10 +1,123 @@
+2022-10-07 John Tsiombikas <nuclear@member.fsf.org>
+
+	freeglut 3.4 changes:
+
+	* Add GLUT_ACTIVE_SUPER modifier, and corresponding GLUT_KEY_SUPER_L
+	and GLUT_KEY_SUPER_R special keys. These map to Windows/Command keys.
+	* Fix RGB mode (GLUT_RGBA) colors on 8bpp displays on windows
+	(construct default RGB332 palette).
+	* Fix indexed color context creation on X11 and windows (GLUT_INDEX).
+	* Add missing colormap management functions for X11 and windows
+	(glutSetColor, glutGetColor).
+	* Fix crash when calling glutTimerFuncUcall.
+	* Fix FreeBSD build by essentially disabling the joystick code for
+	newer FreeBSD versions. It will eventually need to be replaced/fixed.
+	* Add fallbacks for the old GLX (<1.3) context creation API
+	(glXChooseVisual/glXCreateContext), makes us compatible with IRIX 5.x
+	and other old UNIX systems.
+	* Add fallbacks for OpenGL 1.0 (no vertex arrays/client state).
+	* Use nanosleep instead of usleep on UNIX, which is more widely
+	supported on old UNIX systems.
+	* Fix build on X11 if GL_SAMPLES is not defined.
+	* Fix overly strict context version checking on Android leading to
+	context creation failure in some cases.
+	* Fix GLUT_CURSOR_INFO on windows, should be IDC_HAND, not IDC_HELP.
+	* Fix mismatched font declarations on X11.
+	* Add alternative simple ways to build freeglut with native tools only,
+	without having to use cmake.
+	* Fix build on windows with cmake 3.0.0. Explicitly link with gdi32.
+	* Fix build on MSVC 2005.
+	* Fix build on MacOS X. Link with all the necessary X libraries.
+	* Fix build on SGI IRIX.
+	* Fix build on Android (mismatched function prototypes and missing
+	glutCreateMenuUcall).
+	* Add support for the ninja multi-config generator.
+	* Removed spurious dependency on a C++ compiler. One of the demos was
+	being compiled as C++ for no reason.
+	* Silence unnecessary warnings when VBOs or GLSL are not available.
+	* New demo programs: 3dview, keyboard, joystick.
+	* Documentation: added MacOS X build instructions.
+	* Made it possible to eventually support building freeglut as a single
+	compilation unit, by avoiding name conflicts on static variables.
+	* Other minor fixes.
+
+2022-02-06 John Tsiombikas <nuclear@member.fsf.org>
+
+	freeglut 3.2.2 changes:
+
+	* Fix netbsd/aarch64 build by including sys/joystick.h instead of
+	machine/joystick.h.
+	* Fix build with gcc >= 10 which made -fno-common the default by no
+	longer relying on COMMON symbols for globals.
+	* Fix android build (default to FREEGLUT_GLES, and check for debug
+	flags).
+	* Add flat shading option to the shapes demo.
+	* Fix crash when calling primitive drawing functions without creating a
+	window first.
+	* Dropped really old and unmaintained doc directory from the source
+	tree.
+
+2019-09-29 John Tsiombikas <nuclear@member.fsf.org>
+
+	freeglut 3.2.1 changes:
+
+	* Fixed failure to install glut.h when the "replace glut" build option
+	is enabled.
+	* Take into account CMAKE_INSTALL_LIBDIR in the installed cmake module.
+	* Fixed broken menu drawing when the user requests a core profile
+	context.
+
+2019-09-16 John Tsiombikas <nuclear@member.fsf.org>
+
+	freeglut 3.2.0 changes:
+
+	* Added new callback registration functions and corresponding callback
+	types in the extended API, which take an extra user pointer, and pass
+	it through to the callbacks (ucall API).
+	* Added initial wayland support.
+	* Fixed mousewheel callbacks on X11.
+	* Fallback to non-sRGB context, instead of crashing, if the user
+	requested SRGB but failed to get one.
+	* Added GLUT_WINDOW_SRGB query to check if the context supports sRGB or
+	the fallback was triggered.
+	* Added missing spaceball support for windows.
+	* Fixed crash on re-init after having set a custom cursor.
+	* Added init error handler demo.
+	* Added cmake package.
+	* Added GLUT_ALLOW_NEGATIVE_WINDOW_POSITION option.
+	* Fixed incorrect library name in pkg-config files when building with
+	"replace glut" option disabled.
+	* Added spaceball button definitions in the extended API header.
+	* Added the "replace glut" option on windows too.
+	* Fixed missing static defines from pkg-config.
+	* Fixed incorrectly trying to install glut.h when the "replace glut"
+	option is disabled.
+	* Take "maximized" state into account when updating the visibility flag
+	on windows.
+	* Corrected "exit state" checking in the main loop, by placing the check
+	after every glutMainLoopEvent invocation.
+	* Added checking for the XInput dependency in cmake.
+	* Fixed netbsd build (joystick code).
+	* Fixed -pedantic GCC warnings on GNU/Linux.
+	* Fixed PDB installation for nmake/msvc builds on windows.
+	* Clear window work mask when marking it for destruction.
+	* Fixed android build with clang.
+	* Fixed GLUT_STEREO on nvidia windows drivers, which don't play well
+	with fullscreen windows with frames.
+	* Fixed original-GLUT compatibility in spaceball button numbering.
+	* Dropped unnecessary X11 utility library dependencies.
+	* Fixed namespace pollution due to some global symbols missing the fg
+	prefix.
+	* Fixed improper setting of the non-blocking flag in the joystick code
+	on UNIX.
+
 2012-01-09 John F. Fay <johnffay@cybertron.com>
 	* Released freeglut 2.8.0 a few days ago and am restarting the ChangeLog
 	* Added 'cmake' support
 	* Moved source files from 'src' directory to 'src/Common' directory with
 	an eye to moving platform-specific code to separate files in separate
 	directories
- 
+
 2009-08-10 Sven Panne <sven.panne@aedion.de>
 
 	* include/GL/freeglut_ext.h,include/GL/freeglut_std.h,src/freeglut_ext.c,

_service:tar_scm:freeglut-3.4.0.tar.gz/FreeGLUTConfig.cmake.in Added

_service:tar_scm:freeglut-3.0.0.tar.gz/README.cmake -> _service:tar_scm:freeglut-3.4.0.tar.gz/README.cmake Changed

@@ -40,10 +40,14 @@
 - Make sure you have the basics for compiling code, such as C compiler
   (e.g., GCC) and the make package.
 - Also make sure you have packages installed that provide the relevant
-  header files for x11 (including xrandr) and opengl (e.g.,
-  libgl1-mesa-dev, libx11-dev and libxrandr-dev on Debian/Ubuntu).
-- Install XInput: libxi-dev / libXi-devel
-- Run 'cmake .' in the freeglut directory to generate the makefile.
+  header files for opengl (e.g., libgl1-mesa-dev on Debian/Ubuntu) and
+  the chosen backend :
+  - X11: x11 (e.g., libx11-dev, libxrandr-devel on Debian/Ubuntu) and
+  XInput (libxi-dev / libXi-devel)
+  - Wayland: wayland (e.g., libwayland-dev and libegl1-mesa-dev on
+  Debian/Ubuntu) and xkbcommon (libxkbcommon-dev /libxkbcommon-devel)
+- Run 'cmake .' (or 'cmake . -DFREEGLUT_WAYLAND=ON' for Wayland) in the
+  freeglut directory to generate the makefile.
 - Run 'make' to build, and 'make install' to install freeglut.
 - If you wish to change any build options run 'ccmake .'
 
@@ -59,6 +63,8 @@
 FREEGLUT_BUILD_STATIC_LIBS  ON, OFF Build freeglut as a static library
 FREEGLUT_GLES               ON, OFF Link with GLEs libraries instead
                             of OpenGL
+FREEGLUT_WAYLAND            ON, OFF Link with Wayland libraries instead
+                            of X11
 FREEGLUT_PRINT_ERRORS       ON, OFF Controls whether errors are
                             default handled or not when user does not
                             provide an error callback

_service:tar_scm:freeglut-3.4.0.tar.gz/README.macosx Added

@@ -0,0 +1,48 @@
+Freeglut on MacOS X
+===================
+
+Currently freeglut does not support the native Cocoa API and the OpenGL
+framework which works with it, but rather relies on X11 (XQuartz) and the Mesa
+OpenGL and GLX libraries.
+
+The simplest way to set up the prerequisites for building and using freeglut is
+with the homebrew package management system: https://brew.sh
+
+Build instructions
+------------------
+
+Prerequisites:
+ - If you don't already have homebrew, go to https://brew.sh and follow their
+ instructions.
+ - If you don't already have a compiler toolchain installed, download the Xcode
+ commandline tools from the apple store and install them first.
+ - If you don't have XQuartz installed, get it from https://www.xquartz.org
+ - Use homebrew to install cmake, and all the necessary libraries:
+ `brew install cmake libx11 libxi libxrandr libxxf86vm pkg-config mesa`
+
+Build freeglut:
+ - Create a build directory under the freeglut directory and change into it:
+ `mkdir build && cd build`
+ - Run cmake to generate the makefile:
+ `cmake -DFREEGLUT_BUILD_DEMOS=OFF -DOPENGL_gl_LIBRARY=/usr/local/lib/libGL.dylib ..`
+ - Run `make` to build freeglut, and `make install` to install it.
+
+Usage
+-----
+
+To use freeglut in your program **do not** include `<GLUT/glut.h>`; that header
+is part of Apple's GLUT framework. Use `#include <GL/glut.h>` instead as usual,
+or `#include <GL/freeglut.h>` if you wish to take advantage of the extended
+freeglut API.
+
+Similarly, to link with freeglut **do not** use `-framework GLUT` in your
+linker command line. Instead use the standard `-lglut` argument, as you would
+on any other UNIX system.
+
+Known issues
+------------
+
+Some versions of XQuartz do not map the option keys to ALT by default, making
+it impossible to get the `GLUT_ACTIVE_ALT` bit set in the bitmask returned by
+`glutGetModifiers`. To change this behavior go to the XQuartz preferences and
+enable the "Option keys send Alt_L and Alt_R" checkbox in the "input" tab.

_service:tar_scm:freeglut-3.4.0.tar.gz/README.md Added

@@ -0,0 +1,97 @@
+freeglut
+========
+
+!GNU/Linux (X11) build status(https://github.com/FreeGLUTProject/freeglut/actions/workflows/build_gnulinux_x11.yml/badge.svg)
+!Windows build status(https://github.com/FreeGLUTProject/freeglut/actions/workflows/build_win_msvc.yml/badge.svg)
+!MacOS X (X11) build status(https://github.com/FreeGLUTProject/freeglut/actions/workflows/build_macosx_x11.yml/badge.svg)
+
+OVERVIEW
+--------
+
+Freeglut, the Free OpenGL Utility Toolkit, is meant to be a free alternative to
+Mark Kilgard's GLUT library. Freeglut is free software, distributed under an
+MIT/X11 style license. You are free to use, modify, and redistribute freeglut
+with or without modifications (see COPYING for details).
+
+In short, freeglut can be used by OpenGL programs to perform those tasks which
+would normally require platform-specific code. Tasks like creating a window,
+creating an OpenGL context and binding it to the window, and processing input
+events. Freeglut provides a concise and elegant API to handle those tasks, in a
+platform-independent manner, keeping the application simple and portable.
+
+One of the main goals of freeglut, is maximum compatibility. Freeglut is both
+source and binary-compatible with the original GLUT, and can be used as a
+drop-in replacement for it. We take great care to maintain a stable API and ABI,
+and to introduce any new features and improvements in a way which does not
+compromise compatibility.
+
+Freeglut can be used with a wide range of OpenGL implementations, from the very
+early OpenGL 1.0 on SGI computers, to the very latest modern OpenGL versions on
+current GPUs. It can be used to create a classic OpenGL context, or a versioned
+core profile or compatibility context. Freeglut can also be used with OpenGL ES,
+on desktop or mobile devices.
+
+
+PORTS
+-----
+
+Currently supported platforms:
+ - UNIX systems with X11 or Wayland (such as GNU/Linux, FreeBSD, IRIX, etc)
+ - MS Windows
+ - macOS with XQuartz (no native Cocoa support yet)
+ - Android (NDK)
+ - BlackBerry
+
+Consult the platform-specific readme files for details on the level of support
+and build instructions.
+
+
+INSTALLATION
+------------
+
+Freeglut relies on cmake (minimum 3.0.0) to generate build files for all the
+different supported platforms and toolchains.
+
+See `README.cmake`(README.cmake) as a starting point, as well as the other `README`
+files for further info.
+
+For those cases where using cmake is inconvenient, we also provide a set of
+unofficial, unsupported, possibly unmaintained, but potentially useful,
+alternative build files. See `altbuild/README.md`(altbuild/README.md) for details.
+
+
+CONTRIBUTING
+------------
+
+Patches and pull requests for bugfixes and new features are certainly welcome.
+Please send patches to the freeglut-developer mailing list (see CONTACT below).
+
+Feel free to report any bugs you encounter, using the github *issues* system.
+
+Older bug reports and feature requests are still reachable on:
+  - https://sourceforge.net/p/freeglut/bugs/
+  - https://sourceforge.net/p/freeglut/feature-requests/
+
+But you are encouraged to use github issues for new ones.
+
+Alternatively you can also send bug reports and feature requests to the
+freeglut-developer mailing list if you prefer. Extended discussions about new
+features and design issues for large contributions, are best suited to the
+mailing list.
+
+
+CONTACT
+-------
+
+FreeGLUT website: http://freeglut.sourceforge.net
+
+FreeGLUT mailing lists:
+ - developer: https://lists.sourceforge.net/lists/listinfo/freeglut-developer
+ - bugs: https://lists.sourceforge.net/lists/listinfo/freeglut-bugs
+ - announce: https://lists.sourceforge.net/lists/listinfo/freeglut-announce
+
+  You need to subscribe before posting to any of our mailing lists. Make sure
+  to avoid selecting "daily digest mode" if you intend to post, so that you can
+  reply properly to specific messages. Also, please do not top-post, and try to
+  send properly formated emails (text, hard-wrapped at 72 columns, no binary or
+  large attachements).

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild Added

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/Makefile Added

@@ -0,0 +1,76 @@
+# Simple UNIX makefile
+# Builds freeglut as a static library.
+
+# ------- options --------
+
+# installation prefix
+PREFIX = /usr/local
+
+# subdirectory for libraries (lib, lib32, lib64?)
+LIBDIR = lib
+
+# optimization flags
+opt = -O3
+
+# debug symbols
+#dbg = -g
+
+# libraries to link when building the demo program (make demo). You might need
+# to adjust these, depending on the choices in config.h
+demo_libs = $(liba) -lGL -lX11 -lXmu -lXext -lXi -lXrandr -lXxf86vm -lm
+
+# ---- end of options ----
+
+coreobj = src/fg_gl2.o src/fg_misc.o src/fg_input_devices.o src/fg_ext.o \
+	src/fg_joystick.o src/fg_init.o src/fg_callbacks.o \
+	src/fg_menu.o src/fg_stroke_roman.o src/fg_structure.o src/fg_overlay.o \
+	src/fg_window.o src/fg_state.o src/fg_videoresize.o src/fg_spaceball.o \
+	src/fg_cursor.o src/fg_main.o src/fg_gamemode.o \
+	src/fg_stroke_mono_roman.o src/fg_geometry.o src/fg_font.o src/fg_display.o \
+	src/fg_font_data.o src/fg_teapot.o
+
+x11obj = src/x11/fg_state_x11_glx.o src/x11/fg_glutfont_definitions_x11.o \
+	src/x11/fg_joystick_x11.o src/x11/fg_structure_x11.o src/x11/fg_cursor_x11.o \
+	src/x11/fg_state_x11.o src/x11/fg_main_x11.o src/x11/fg_spaceball_x11.o \
+	src/x11/fg_input_devices_x11.o src/x11/fg_ext_x11.o src/x11/fg_window_x11_glx.o \
+	src/x11/fg_gamemode_x11.o src/x11/fg_init_x11.o src/x11/fg_menu_x11.o \
+	src/x11/fg_xinput_x11.o src/x11/fg_window_x11.o src/x11/fg_display_x11_glx.o \
+	src/x11/fg_cmap_x11.o
+
+obj = $(coreobj) $(x11obj)
+
+liba = libglut.a
+incpath = -I. -Isrc -Iinclude -I/usr/local/include -I/usr/X11R6/include
+libpath = -L/usr/local/lib -L/usr/X11R6/lib
+
+CFLAGS = -O2 $(incpath) -DHAVE_CONFIG_H
+LDFLAGS = $(libpath)
+
+
+$(liba): $(obj)
+	$(AR) rcs $@ $(obj)
+
+demo: progs/demos/3dview/3dview.o $(liba)
+	$(CC) -o $@ progs/demos/3dview/3dview.o $(LDFLAGS) $(demo_libs)
+
+.c.o:
+	$(CC) -o $@ $(CFLAGS) -c $<
+
+.PHONY: clean
+clean:
+	rm -f $(obj) $(liba) demo
+
+.PHONY: install
+install: $(liba)
+	mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR) $(DESTDIR)$(PREFIX)/include/GL
+	cp include/GL/* $(DESTDIR)$(PREFIX)/include/GL
+	cp $(liba) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(liba)
+
+.PHONY: uninstall
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(liba)
+	rm -f $(DESTDIR)$(PREFIX)/include/GL/glut.h
+	rm -f $(DESTDIR)$(PREFIX)/include/GL/freeglut.h
+	rm -f $(DESTDIR)$(PREFIX)/include/GL/freeglut_std.h
+	rm -f $(DESTDIR)$(PREFIX)/include/GL/freeglut_ext.h
+	rm -f $(DESTDIR)$(PREFIX)/include/GL/freeglut_ucall.h

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/README.md Added

@@ -0,0 +1,66 @@
+Simple build files for freeglut
+===============================
+This directory includes a number of simple ways to build freeglut, without
+relying on extra tools.
+
+The official build system used by freeglut is cmake, with the current minimum
+cmake version required being set to 3.0. Installing and using cmake 3.0 or later
+to generate build files might be difficult or inconvenient in some cases.
+Installing modern versions of cmake on very old UNIX systems might be difficult
+or impossible. And finding the exact cmake version which still supports
+generating project files for a certain old IDE, dropped from current cmake, can
+be annoying.
+
+None of the files in this directory are officially supported! Some of them might
+be completely unmaintained, broken, or out of date. Please report any issues,
+but be warned that you may have to fix them yourself.
+
+The simple build files in this directory do not build the demo programs, and do
+not provide the same flexibility of build options as the official cmake build.
+Most of them just build a default configuration of freeglut as a static library
+and that's it.
+
+Configuration
+-------------
+Before using any of these build files, first you'll need to select one of the
+`config.h.*` files provided, copy it to the project root directory with the name
+`config.h`. The following config files are available:
+
+  - config.h.unix: Modern UNIX with X11 (GNU/Linux, FreeBSD, etc).
+  - config.h.msvc6: Windows build with MS Visual C/C++ 6.0.
+  - config.h.irix5: IRIX 5.x build with the SGI compiler.
+  - config.h.irix6: IRIX 6.x build with the SGI compiler.
+
+You can edit the `config.h` file to remove unnecessary dependencies (and their
+corresponding features). For example, some old X servers do not have the XRandR
+extension, or you may not wish to install libXrandr, in which case you should
+disable it by deleting the `#define HAVE_X11_EXTENSIONS_XRANDR_H` line, or
+changing `define` to `undef`.
+
+Simple UNIX Makefile
+--------------------
+This should build freeglut on many different UNIX systems with their native
+make utility.
+
+  - Copy `Makefile` to the project root directory.
+  - Copy the appropriate `config.h.*` file to the project root directory renamed
+    to `config.h`.
+  - `make` to build.
+  - `make install` to install. Change the `PREFIX` variable at the top of the
+    `Makefile` to change the installation prefix.
+
+You can also attempt to build a simple statically linked demo program, by typing
+`make demo`. But be warned that you might need to modify the `demo_libs`
+variable at the top of the `Makefile` to adjust for whatever options are
+selected in the `config.h` you used to build freeglut.
+
+MS Visual Studio 6.0 project
+----------------------------
+Project files for building freeglut on 32bit windows, using MSVC6.
+
+  - Copy `config.h.msvc6` to the project root directory renamed to `config.h`.
+  - Open the `freeglut.dsw` "workspace" file with visual studio 6.
+  - Select build all from the build menu.
+
+The MSVC6 project builds freeglut as both a static library and a DLL, and also
+builds a simple statically linked demo program.

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/config.h.irix5 Added

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/config.h.irix6 Added

@@ -0,0 +1,35 @@
+/* freeglut configuration file for IRIX 6.x (tested 6.5.26)
+ *
+ * #define to enable, #undef or delete line to disable
+ *
+ * Copy to the freeglut root directory as config.h along with altbuild/Makefile
+ */
+
+/* warning and errors printed? */
+#define FREEGLUT_PRINT_WARNINGS
+#define FREEGLUT_PRINT_ERRORS
+
+/* all of these should be available on relatively modern UNIX systems */
+#define HAVE_SYS_TYPES_H	/* sys/types.h */
+#define HAVE_UNISTD_H		/* unistd.h */
+#define HAVE_SYS_TIME_H		/* sys/time.h */
+#define HAVE_SYS_PARAM_H	/* sys/param.h */
+#define HAVE_SYS_IOCTL_H	/* sys/ioctl.h */
+#define HAVE_FCNTL_H		/* fcntl.h */
+#define HAVE_ERRNO_H		/* errno.h */
+#define HAVE_GETTIMEOFDAY	/* gettimeofday() */
+#define HAVE_VFPRINTF		/* vfprintf() */
+#define HAVE_INTTYPES_H		/* inttypes.h */
+#define HAVE_ULONG_LONG		/* unsigned long long */
+#undef HAVE_STDINT_H		/* stdint.h - not available with MIPSpro cc */
+
+/* don't need, XParseGeometry is in libX11 */
+#undef NEED_XPARSEGEOMETRY_IMPL
+/* __int64 fallback is for msvc */
+#undef HAVE_U__INT64
+/* SGI X server does not support xf86vm, xrandr, and xinput2 */
+#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
+#undef HAVE_X11_EXTENSIONS_XRANDR_H
+#undef HAVE_X11_EXTENSIONS_XINPUT2_H
+/* USB HID, is only needed needed for joystick on BSD */
+#undef HAVE_USBHID_H

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/config.h.msvc6 Added

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/config.h.unix Added

@@ -0,0 +1,37 @@
+/* freeglut configuration file for GNU/Linux and BSD
+ *
+ * #define to enable, #undef or delete line to disable
+ *
+ * Copy to the freeglut root directory as config.h along with altbuild/Makefile
+ */
+
+/* XFree86 Video Mode extension, used for game mode, requires libXxf86vm */
+#define HAVE_X11_EXTENSIONS_XF86VMODE_H
+/* XR&R extension, used for game mode, requires libXrandr */
+#define HAVE_X11_EXTENSIONS_XRANDR_H
+/* XInput2 extension, used for joystick input, requires libXi */
+#define HAVE_X11_EXTENSIONS_XINPUT2_H
+/* USB HID, needed for joystick on BSD, requires libusbhid */
+#define HAVE_USBHID_H
+/* warning and errors printed? */
+#define FREEGLUT_PRINT_WARNINGS
+#define FREEGLUT_PRINT_ERRORS
+
+/* all of these should be available on relatively modern UNIX systems */
+#define HAVE_SYS_TYPES_H	/* sys/types.h */
+#define HAVE_UNISTD_H		/* unistd.h */
+#define HAVE_SYS_TIME_H		/* sys/time.h */
+#define HAVE_SYS_PARAM_H	/* sys/param.h */
+#define HAVE_SYS_IOCTL_H	/* sys/ioctl.h */
+#define HAVE_FCNTL_H		/* fcntl.h */
+#define HAVE_ERRNO_H		/* errno.h */
+#define HAVE_GETTIMEOFDAY	/* gettimeofday() */
+#define HAVE_VFPRINTF		/* vfprintf() */
+#define HAVE_STDINT_H		/* stdint.h - might not be available, undef if not found */
+#define HAVE_INTTYPES_H		/* inttypes.h */
+#define HAVE_ULONG_LONG		/* unsigned long long */
+
+/* don't need, XParseGeometry is in libX11 */
+#undef NEED_XPARSEGEOMETRY_IMPL
+/* __int64 fallback is for msvc */
+#undef HAVE_U__INT64

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/demo.dsp Added

@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="demo" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=demo - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "demo.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "demo.mak" CFG="demo - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "demo - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "demo - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "demo - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "FREEGLUT_STATIC" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"Release"
+
+!ELSEIF "$(CFG)" == "demo - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "FREEGLUT_STATIC" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Debug"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "demo - Win32 Release"
+# Name "demo - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\progs\demos\3dview\3dview.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/freeglut.dsp Added

@@ -0,0 +1,318 @@
+# Microsoft Developer Studio Project File - Name="freeglut" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=freeglut - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "freeglut.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "freeglut.mak" CFG="freeglut - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "freeglut - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "freeglut - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "freeglut - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FREEGLUT_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FREEGLUT_EXPORTS" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x0500 /D WINVER=0x0500 /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+
+!ELSEIF "$(CFG)" == "freeglut - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FREEGLUT_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".." /I "../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FREEGLUT_EXPORTS" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x0500 /D WINVER=0x0500 /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/freeglutd.dll" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "freeglut - Win32 Release"
+# Name "freeglut - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_callback_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_callbacks.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_cmap_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_cursor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_cursor_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_display.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_display_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_ext.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_ext_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_font.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_font_data.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_gamemode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_gamemode_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_geometry.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_gl2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_gl2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_init.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_init_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_input_devices.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_input_devices_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_internal_mswin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_joystick.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_joystick_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_main.c
+# End Source File

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/freeglut.dsw Added

@@ -0,0 +1,59 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "demo"=.\demo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name freeglut_static
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name freeglut
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "freeglut"=.\freeglut.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "freeglut_static"=.\freeglut_static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/freeglut_static.dsp Added

@@ -0,0 +1,304 @@
+# Microsoft Developer Studio Project File - Name="freeglut_static" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=freeglut_static - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "freeglut_static.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "freeglut_static.mak" CFG="freeglut_static - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "freeglut_static - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "freeglut_static - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "freeglut_static - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release_static"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release_static"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "FREEGLUT_STATIC" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x0500 /D WINVER=0x0500 /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "freeglut_static - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug_static"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug_static"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "FREEGLUT_STATIC" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x0500 /D WINVER=0x0500 /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"Debug\freeglut_staticd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "freeglut_static - Win32 Release"
+# Name "freeglut_static - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_callback_macros.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_callbacks.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_cmap_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_cursor.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_cursor_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_display.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_display_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_ext.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_ext_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_font.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_font_data.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_gamemode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_gamemode_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_geometry.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_gl2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_gl2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_init.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_init_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_input_devices.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_input_devices_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_internal_mswin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_joystick.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_joystick_mswin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\fg_main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\mswin\fg_main_mswin.c
+# End Source File
+# Begin Source File
+

_service:tar_scm:freeglut-3.4.0.tar.gz/altbuild/freeglutdll.def Added

@@ -0,0 +1,165 @@
+VERSION 3.4
+EXPORTS
+    glutInit
+    glutInitWindowPosition
+    glutInitWindowSize
+    glutInitDisplayMode
+    glutInitDisplayString
+    glutMainLoop
+    glutMainLoopEvent
+    glutLeaveMainLoop
+    glutCreateWindow
+    glutCreateSubWindow
+    glutDestroyWindow
+    glutSetWindow
+    glutGetWindow
+    glutSetWindowData
+    glutGetWindowData
+    glutSetWindowTitle
+    glutSetIconTitle
+    glutReshapeWindow
+    glutPositionWindow
+    glutShowWindow
+    glutHideWindow
+    glutIconifyWindow
+    glutPushWindow
+    glutPopWindow
+    glutFullScreen
+    glutPostWindowRedisplay
+    glutPostRedisplay
+    glutSwapBuffers
+    glutWarpPointer
+    glutSetCursor
+    glutEstablishOverlay
+    glutRemoveOverlay
+    glutUseLayer
+    glutPostOverlayRedisplay
+    glutPostWindowOverlayRedisplay
+    glutShowOverlay
+    glutHideOverlay
+    glutCreateMenu
+    glutDestroyMenu
+    glutGetMenu
+    glutSetMenu
+    glutGetMenuData
+    glutSetMenuData
+    glutAddMenuEntry
+    glutAddSubMenu
+    glutChangeToMenuEntry
+    glutChangeToSubMenu
+    glutRemoveMenuItem
+    glutAttachMenu
+    glutDetachMenu
+    glutTimerFunc
+    glutIdleFunc
+    glutKeyboardFunc
+    glutSpecialFunc
+    glutReshapeFunc
+    glutPositionFunc
+    glutVisibilityFunc
+    glutDisplayFunc
+    glutMouseFunc
+    glutMouseWheelFunc
+    glutMotionFunc
+    glutPassiveMotionFunc
+    glutEntryFunc
+    glutCloseFunc
+    glutWMCloseFunc
+    glutKeyboardUpFunc
+    glutSpecialUpFunc
+    glutJoystickFunc
+    glutMenuStateFunc
+    glutMenuStatusFunc
+    glutMenuDestroyFunc
+    glutOverlayDisplayFunc
+    glutWindowStatusFunc
+    glutSpaceballMotionFunc
+    glutSpaceballRotateFunc
+    glutSpaceballButtonFunc
+    glutButtonBoxFunc
+    glutDialsFunc
+    glutTabletMotionFunc
+    glutTabletButtonFunc
+    glutSetOption
+    glutGet
+    glutDeviceGet
+    glutGetModifiers
+    glutLayerGet
+    glutBitmapCharacter
+    glutBitmapWidth
+    glutStrokeCharacter
+    glutStrokeWidth
+    glutBitmapLength
+    glutStrokeLength
+    glutBitmapHeight
+    glutStrokeHeight
+    glutBitmapString
+    glutStrokeString
+    glutWireCube
+    glutSolidCube
+    glutWireSphere
+    glutSolidSphere
+    glutWireCone
+    glutSolidCone
+    glutWireTorus
+    glutSolidTorus
+    glutWireDodecahedron
+    glutSolidDodecahedron
+    glutWireOctahedron
+    glutSolidOctahedron
+    glutWireTetrahedron
+    glutSolidTetrahedron
+    glutWireIcosahedron
+    glutSolidIcosahedron
+    glutWireRhombicDodecahedron
+    glutSolidRhombicDodecahedron
+    glutWireSierpinskiSponge
+    glutSolidSierpinskiSponge
+    glutWireTeapot
+    glutSolidTeapot
+    glutWireTeacup
+    glutSolidTeacup
+    glutWireTeaspoon
+    glutSolidTeaspoon
+    glutWireCylinder
+    glutSolidCylinder
+    glutGameModeString
+    glutEnterGameMode
+    glutLeaveGameMode
+    glutGameModeGet
+    glutVideoResizeGet
+    glutSetupVideoResizing
+    glutStopVideoResizing
+    glutVideoResize
+    glutVideoPan
+    glutSetColor
+    glutGetColor
+    glutCopyColormap
+    glutIgnoreKeyRepeat
+    glutSetKeyRepeat
+    glutForceJoystickFunc
+    glutExtensionSupported
+    glutReportErrors
+    glutGetProcAddress
+    glutExit
+    glutFullScreenToggle
+    glutLeaveFullScreen
+    glutSetMenuFont
+    glutGetModeValues
+    glutInitContextFlags
+    glutInitContextVersion
+    glutInitContextProfile
+    glutInitErrorFunc
+    glutInitWarningFunc
+    __glutInitWithExit
+    __glutCreateWindowWithExit
+    __glutCreateMenuWithExit
+    glutMultiButtonFunc
+    glutMultiEntryFunc
+    glutMultiMotionFunc
+    glutMultiPassiveFunc
+    glutInitContextFunc
+    glutAppStatusFunc
+    glutSetVertexAttribCoord3
+    glutSetVertexAttribNormal
+    glutSetVertexAttribTexCoord2

_service:tar_scm:freeglut-3.0.0.tar.gz/include/GL/freeglut_ext.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/include/GL/freeglut_ext.h Changed

@@ -44,6 +44,13 @@
 #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
@@ -90,6 +97,10 @@
 
 #define  GLUT_STROKE_FONT_DRAW_JOIN_DOTS    0x0206  /* Draw dots between line segments of stroke fonts? */
 
+#define  GLUT_ALLOW_NEGATIVE_WINDOW_POSITION 0x0207 /* GLUT doesn't allow negative window positions by default */
+
+#define  GLUT_WINDOW_SRGB                   0x007D
+
 /*
  * New tokens for glutInitDisplayMode.
  * Only one GLUT_AUXn bit may be used at a time.
@@ -125,6 +136,16 @@
 #define	GLUT_COMPATIBILITY_PROFILE          0x0002
 
 /*
+* GLUT API Extension macro definitions -- Spaceball button definitions
+*/
+
+#define  GLUT_SPACEBALL_BUTTON_A            0x0001
+#define  GLUT_SPACEBALL_BUTTON_B            0x0002
+#define  GLUT_SPACEBALL_BUTTON_C            0x0004
+#define  GLUT_SPACEBALL_BUTTON_D            0x0008
+#define  GLUT_SPACEBALL_BUTTON_E            0x0010
+
+/*
  * Process loop function, see fg_main.c
  */
 FGAPI void    FGAPIENTRY glutMainLoopEvent( void );
@@ -244,13 +265,13 @@
 FGAPI void    FGAPIENTRY glutInitWarningFunc( void (* callback)( const char *fmt, va_list ap ) );
 
 /* OpenGL >= 2.0 support */
-FGAPI void    FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib);
-FGAPI void    FGAPIENTRY glutSetVertexAttribNormal(GLint attrib);
-FGAPI void    FGAPIENTRY glutSetVertexAttribTexCoord2(GLint attrib);
+FGAPI void    FGAPIENTRY glutSetVertexAttribCoord3( GLint attrib );
+FGAPI void    FGAPIENTRY glutSetVertexAttribNormal( GLint attrib );
+FGAPI void    FGAPIENTRY glutSetVertexAttribTexCoord2( GLint attrib );
 
 /* Mobile platforms lifecycle */
-FGAPI void    FGAPIENTRY glutInitContextFunc(void (* callback)());
-FGAPI void    FGAPIENTRY glutAppStatusFunc(void (* callback)(int));
+FGAPI void    FGAPIENTRY glutInitContextFunc( void (* callback)( void ) );
+FGAPI void    FGAPIENTRY glutAppStatusFunc( void (* callback)( int ) );
 /* state flags that can be passed to callback set by glutAppStatusFunc */
 #define GLUT_APPSTATUS_PAUSE                0x0001
 #define GLUT_APPSTATUS_RESUME               0x0002
@@ -262,6 +283,9 @@
 #define  GLUT_BORDERLESS                    0x0800
 #define  GLUT_SRGB                          0x1000
 
+/* User-argument callbacks and implementation */
+#include "freeglut_ucall.h"
+
 #ifdef __cplusplus
     }
 #endif

_service:tar_scm:freeglut-3.4.0.tar.gz/include/GL/freeglut_ucall.h Added

@@ -0,0 +1,113 @@
+#ifndef __FREEGLUT_UCALL_H__
+#define __FREEGLUT_UCALL_H__
+
+/*
+ * freeglut_ucall.h
+ *
+ * Callbacks with user data arguments.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/*
+ * Menu stuff, see fg_menu.c
+ */
+FGAPI int FGAPIENTRY glutCreateMenuUcall( void (* callback)( int menu, void* user_data ), void* user_data );
+
+/*
+ * Global callback functions, see fg_callbacks.c
+ */
+FGAPI void FGAPIENTRY glutTimerFuncUcall( unsigned int time, void (* callback)( int, void* ), int value, void* user_data );
+FGAPI void FGAPIENTRY glutIdleFuncUcall( void (* callback)( void* ), void* user_data );
+
+/*
+ * Window-specific callback functions, see fg_callbacks.c
+ */
+FGAPI void FGAPIENTRY glutKeyboardFuncUcall( void (* callback)( unsigned char, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutSpecialFuncUcall( void (* callback)( int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutReshapeFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutVisibilityFuncUcall( void (* callback)( int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutDisplayFuncUcall( void (* callback)( void* ), void* user_data );
+FGAPI void FGAPIENTRY glutMouseFuncUcall( void (* callback)( int, int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutMotionFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutPassiveMotionFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutEntryFuncUcall( void (* callback)( int, void* ), void* user_data );
+
+FGAPI void FGAPIENTRY glutKeyboardUpFuncUcall( void (* callback)( unsigned char, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutSpecialUpFuncUcall( void (* callback)( int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutJoystickFuncUcall( void (* callback)( unsigned int, int, int, int, void* ), int pollInterval, void* user_data );
+FGAPI void FGAPIENTRY glutMenuStatusFuncUcall( void (* callback)( int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutOverlayDisplayFuncUcall( void (* callback)( void* ), void* user_data );
+FGAPI void FGAPIENTRY glutWindowStatusFuncUcall( void (* callback)( int, void* ), void* user_data );
+
+FGAPI void FGAPIENTRY glutSpaceballMotionFuncUcall( void (* callback)( int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutSpaceballRotateFuncUcall( void (* callback)( int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutSpaceballButtonFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutButtonBoxFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutDialsFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutTabletMotionFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutTabletButtonFuncUcall( void (* callback)( int, int, int, int, void* ), void* user_data );
+
+FGAPI void FGAPIENTRY glutMouseWheelFuncUcall( void (* callback)( int, int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutPositionFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutCloseFuncUcall( void (* callback)( void* ), void* user_data );
+FGAPI void FGAPIENTRY glutWMCloseFuncUcall( void (* callback)( void* ), void* user_data );
+FGAPI void FGAPIENTRY glutMenuDestroyFuncUcall( void (* callback)( void* ), void* user_data );
+
+/*
+ * Multi-touch/multi-pointer extensions
+ */
+FGAPI void FGAPIENTRY glutMultiEntryFuncUcall( void (* callback)( int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutMultiButtonFuncUcall( void (* callback)( int, int, int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutMultiMotionFuncUcall( void (* callback)( int, int, int, void* ), void* user_data );
+FGAPI void FGAPIENTRY glutMultiPassiveFuncUcall( void (* callback)( int, int, int, void* ), void* user_data );
+
+/*
+ * Initialization functions, see fg_init.c
+ */
+#include <stdarg.h>
+FGAPI void FGAPIENTRY glutInitErrorFuncUcall( void (* callback)( const char *fmt, va_list ap, void* user_data ), void* user_data );
+FGAPI void FGAPIENTRY glutInitWarningFuncUcall( void (* callback)( const char *fmt, va_list ap, void* user_data ), void* user_data );
+
+/* Mobile platforms lifecycle */
+FGAPI void FGAPIENTRY glutInitContextFuncUcall( void (* callback)( void* ), void* user_data );
+FGAPI void FGAPIENTRY glutAppStatusFuncUcall( void (* callback)( int, void* ), void* user_data );
+
+/*
+ * Continued "hack" from GLUT applied to Ucall functions.
+ * For more info, see bottom of freeglut_std.h
+ */
+
+/* to get the prototype for exit() */
+#include <stdlib.h>
+
+#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) && !defined(__WATCOMC__)
+FGAPI int FGAPIENTRY __glutCreateMenuUcallWithExit(void(*func)(int, void*), void(__cdecl *exitfunc)(int), void* user_data);
+#ifndef FREEGLUT_BUILDING_LIB
+#if defined(__GNUC__)
+#define FGUNUSED __attribute__((unused))
+#else
+#define FGUNUSED
+#endif
+static int FGAPIENTRY FGUNUSED glutCreateMenuUcall_ATEXIT_HACK(void(*func)(int, void*), void* user_data) { return __glutCreateMenuUcallWithExit(func, exit, user_data); }
+#define glutCreateMenuUcall glutCreateMenuUcall_ATEXIT_HACK
+#endif
+#endif
+
+#ifdef __cplusplus
+ }
+#endif
+
+/*** END OF FILE ***/
+
+#endif /* __FREEGLUT_UCALL_H__ */
+

_service:tar_scm:freeglut-3.0.0.tar.gz/mingw_cross_toolchain.cmake -> _service:tar_scm:freeglut-3.4.0.tar.gz/mingw_cross_toolchain.cmake Changed

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/3dview Added

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/3dview/3dview.c Added

@@ -0,0 +1,309 @@
+/* 3D view manipulation demo
+ * Written by John Tsiombikas <nuclear@member.fsf.org>
+ *
+ * Demonstrates how to use freeglut callbacks to manipulate a 3D view, similarly
+ * to how a modelling program or a model viewer would operate.
+ *
+ * Rotate: drag with the left mouse button.
+ * Scale: drag up/down with the right mouse button.
+ * Pan: drag with the middle mouse button.
+ *
+ * Press space to animate the scene and update the display continuously, press
+ * again to return to updating only when the view needs to change.
+ * Press escape or q to exit.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <GL/freeglut.h>
+
+#ifndef M_PI
+#define M_PI	3.14159265358979323846
+#endif
+
+#ifdef _MSC_VER
+#pragma warning (disable: 4305 4244)
+#endif
+
+static const char *helpprompt = {"Press F1 for help", 0};
+static const char *helptext = {
+	"Rotate: left mouse drag",
+	" Scale: right mouse drag up/down",
+	" Pan: middle mouse drag",
+	"",
+	"Toggle fullscreen: f",
+	"Toggle animation: space",
+	"Quit: escape",
+	0
+};
+
+void idle(void);
+void display(void);
+void print_help(void);
+void reshape(int x, int y);
+void keypress(unsigned char key, int x, int y);
+void skeypress(int key, int x, int y);
+void mouse(int bn, int st, int x, int y);
+void motion(int x, int y);
+
+int win_width, win_height;
+float cam_theta, cam_phi = 25, cam_dist = 8;
+float cam_pan3;
+int mouse_x, mouse_y;
+int bnstate8;
+int anim, help;
+long anim_start;
+long nframes;
+
+#ifndef GL_FRAMEBUFFER_SRGB
+#define GL_FRAMEBUFFER_SRGB	0x8db9
+#endif
+
+#ifndef GL_MULTISAMPLE
+#define GL_MULTISAMPLE 0x809d
+#endif
+
+int main(int argc, char **argv)
+{
+	glutInit(&argc, argv);
+	glutInitWindowSize(800, 600);
+	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
+	glutCreateWindow("freeglut 3D view demo");
+
+	glutDisplayFunc(display);
+	glutReshapeFunc(reshape);
+	glutKeyboardFunc(keypress);
+	glutSpecialFunc(skeypress);
+	glutMouseFunc(mouse);
+	glutMotionFunc(motion);
+
+	glEnable(GL_DEPTH_TEST);
+	glEnable(GL_CULL_FACE);
+	glEnable(GL_LIGHTING);
+	glEnable(GL_LIGHT0);
+
+	glutMainLoop();
+	return 0;
+}
+
+void idle(void)
+{
+	glutPostRedisplay();
+}
+
+void display(void)
+{
+	long tm;
+	float lpos = {-1, 2, 3, 0};
+
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+	glTranslatef(0, 0, -cam_dist);
+	glRotatef(cam_phi, 1, 0, 0);
+	glRotatef(cam_theta, 0, 1, 0);
+	glTranslatef(cam_pan0, cam_pan1, cam_pan2);
+
+	glLightfv(GL_LIGHT0, GL_POSITION, lpos);
+
+	glPushMatrix();
+	if(anim) {
+		tm = glutGet(GLUT_ELAPSED_TIME) - anim_start;
+		glRotatef(tm / 10.0f, 1, 0, 0);
+		glRotatef(tm / 10.0f, 0, 1, 0);
+	}
+	glutSolidTorus(0.3, 1, 16, 24);
+	glPopMatrix();
+
+	glutSolidSphere(0.4, 16, 8);
+
+	glPushMatrix();
+	glTranslatef(-2.5, 0, 0);
+	glutSolidCube(1.5);
+	glPopMatrix();
+
+	glPushMatrix();
+	glTranslatef(2.5, -1, 0);
+	glRotatef(-90, 1, 0, 0);
+	glutSolidCone(1.1, 2, 16, 2);
+	glPopMatrix();
+
+	glPushMatrix();
+	glTranslatef(0, -0.5, 2.5);
+	glFrontFace(GL_CW);
+	glutSolidTeapot(1.0);
+	glFrontFace(GL_CCW);
+	glPopMatrix();
+
+	glBegin(GL_QUADS);
+	glNormal3f(0, 1, 0);
+	glVertex3f(-5, -1.3, 5);
+	glVertex3f(5, -1.3, 5);
+	glVertex3f(5, -1.3, -5);
+	glVertex3f(-5, -1.3, -5);
+	glEnd();
+
+	print_help();
+
+	glutSwapBuffers();
+	nframes++;
+}
+
+void print_help(void)
+{
+	int i;
+	const char *s, **text;
+
+	glPushAttrib(GL_ENABLE_BIT);
+	glDisable(GL_LIGHTING);
+	glDisable(GL_DEPTH_TEST);
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	glLoadIdentity();
+	glOrtho(0, win_width, 0, win_height, -1, 1);
+
+	text = help ? helptext : helpprompt;
+
+	for(i=0; texti; i++) {
+		glColor3f(0, 0.1, 0);
+		glRasterPos2f(7, win_height - (i + 1) * 20 - 2);
+		s = texti;
+		while(*s) {
+			glutBitmapCharacter(GLUT_BITMAP_9_BY_15, *s++);
+		}
+		glColor3f(0, 0.9, 0);
+		glRasterPos2f(5, win_height - (i + 1) * 20);
+		s = texti;
+		while(*s) {
+			glutBitmapCharacter(GLUT_BITMAP_9_BY_15, *s++);
+		}
+	}
+
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+
+	glPopAttrib();
+}
+
+#define ZNEAR	0.5f
+void reshape(int x, int y)
+{
+	float vsz, aspect = (float)x / (float)y;
+	win_width = x;
+	win_height = y;
+
+	glViewport(0, 0, x, y);

_service:tar_scm:freeglut-3.0.0.tar.gz/progs/demos/CallbackMaker/CallbackMaker.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/CallbackMaker/CallbackMaker.c Changed

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/indexed_color Added

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/indexed_color/idxcol.c Added

@@ -0,0 +1,175 @@
+/* Indexed color mode demo
+ * Written by John Tsiombikas <nuclear@member.fsf.org>
+ *
+ * Demonstrates how to create an indexed color OpenGL context, manipulate the
+ * colormap, and do lighting in indexed color mode.
+ *
+ * Obviously none of this will work if your OpenGL implementation and/or
+ * window system does not support indexed color.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <GL/freeglut.h>
+
+void display(void);
+void reshape(int x, int y);
+void keyb(unsigned char key, int x, int y);
+void mouse(int bn, int st, int x, int y);
+void motion(int x, int y);
+
+float cam_theta, cam_phi, cam_dist = 6;
+
+int prev_x, prev_y;
+int bnstate8;
+
+int sphere, torus;
+int redramp3, blueramp3;
+
+
+int main(int argc, char **argv)
+{
+	int i, ncolors, rampsz, maxdif;
+	float x;
+
+	glutInit(&argc, argv);
+	/* request an indexed color visual, this will fail on most modern systems */
+	glutInitDisplayMode(GLUT_INDEX | GLUT_DEPTH | GLUT_DOUBLE);
+	glutInitWindowSize(640, 480);
+	glutCreateWindow("FreeGLUT indexed color demo");
+
+	glutDisplayFunc(display);
+	glutReshapeFunc(reshape);
+	glutKeyboardFunc(keyb);
+	glutMouseFunc(mouse);
+	glutMotionFunc(motion);
+
+	glEnable(GL_DEPTH_TEST);
+	glEnable(GL_CULL_FACE);
+
+	ncolors = glutGet(GLUT_WINDOW_COLORMAP_SIZE);
+	printf("Colormap size: %d\n", ncolors);
+
+	rampsz = ncolors / 2;
+	maxdif = (int)(rampsz * 0.75f);
+
+	/* prepare a palette with two color ramps for a red and a blue object */
+	for(i=0; i<rampsz; i++) {
+		if(i < maxdif) {
+			x = (float)i / (maxdif - 1);
+			glutSetColor(i, x, 0, 0);
+			glutSetColor(i + rampsz, 0, 0, x);
+		} else {
+			x = (float)(i - maxdif) / (rampsz - maxdif - 1);
+			glutSetColor(i, 1, x, x);
+			glutSetColor(i + rampsz, x, x, 1);
+		}
+	}
+	/* prepare the indexed color lighting descriptors needed by OpenGL to
+	 * compute lighting in indexed color mode.
+	 */
+	redramp0 = 0;				/* unlit color index*/
+	redramp1 = maxdif - 1;	/* maximum diffuse color index*/
+	redramp2 = rampsz - 1;	/* maximum specularity color index */
+	blueramp0 = rampsz;		/* ... and same for the blue ramp ... */
+	blueramp1 = rampsz + maxdif - 1;
+	blueramp2 = rampsz * 2 - 1;
+
+	/* set the specular exponent for all objects once */
+	glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 40);
+
+
+	sphere = glGenLists(1);
+	glNewList(sphere, GL_COMPILE);
+	glutSolidSphere(1, 30, 15);
+	glEndList();
+
+	torus = glGenLists(1);
+	glNewList(torus, GL_COMPILE);
+	glutSolidTorus(0.35, 0.9, 20, 40);
+	glEndList();
+
+	glEnable(GL_LIGHTING);
+	glEnable(GL_LIGHT0);
+
+	glutMainLoop();
+	return 0;
+}
+
+void display(void)
+{
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+	glTranslatef(0, 0, -cam_dist);
+	glRotatef(cam_phi, 1, 0, 0);
+	glRotatef(cam_theta, 0, 1, 0);
+
+	/* set up the red object's lighting indices */
+	glMaterialiv(GL_FRONT_AND_BACK, GL_COLOR_INDEXES, redramp);
+
+	glPushMatrix();
+	glTranslatef(-1.5, 0, 0);
+	glCallList(sphere);
+	glPopMatrix();
+
+	/* setup the blue object's lighting indices */
+	glMaterialiv(GL_FRONT_AND_BACK, GL_COLOR_INDEXES, blueramp);
+
+	glPushMatrix();
+	glTranslatef(1.5, 0, 0);
+	glRotatef(90, 1, 0, 0);
+	glCallList(torus);
+	glPopMatrix();
+
+	glutSwapBuffers();
+}
+
+void reshape(int x, int y)
+{
+	glViewport(0, 0, x, y);
+
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	gluPerspective(50.0, (float)x / y, 0.5, 500.0);
+}
+
+void keyb(unsigned char key, int x, int y)
+{
+	switch(key) {
+	case 27:
+		exit(0);
+	}
+}
+
+void mouse(int bn, int st, int x, int y)
+{
+	bnstatebn - GLUT_LEFT_BUTTON = st == GLUT_DOWN;
+	prev_x = x;
+	prev_y = y;
+}
+
+void motion(int x, int y)
+{
+	int dx, dy;
+
+	dx = x - prev_x;
+	dy = y - prev_y;
+	prev_x = x;
+	prev_y = y;
+
+	if(!(dx | dy)) return;
+
+	if(bnstate0) {
+		cam_theta += dx * 0.5f;
+		cam_phi += dy * 0.5f;
+		if(cam_phi < -90) cam_phi = -90;
+		if(cam_phi > 90) cam_phi = 90;
+		glutPostRedisplay();
+	}
+	if(bnstate2) {
+		cam_dist += dy * 0.1f;
+		if(cam_dist < 0) cam_dist = 0;
+		glutPostRedisplay();
+	}
+}

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/joystick Added

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/joystick/joystick.c Added

@@ -0,0 +1,221 @@
+/* Joystick demo
+ * Written by John Tsiombikas <nuclear@member.fsf.org>
+ * Press escape or q to exit.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <math.h>
+#include <GL/freeglut.h>
+
+#ifndef M_PI
+#define M_PI	3.14159265358979323846
+#endif
+
+#ifdef _MSC_VER
+#pragma warning (disable: 4305 4244)
+#endif
+
+void display(void);
+void rect(float x0, float y0, float x1, float y1);
+void text(float x, float y, const char *fmt, ...);
+void widget(float xsz, float ysz, float xpos, float ypos);
+void button(float sz, float state);
+void reshape(int x, int y);
+void keyboard(unsigned char key, int x, int y);
+void joystick(unsigned int bmask, int x, int y, int z);
+
+int win_width, win_height;
+int joy3;
+unsigned int joy_bmask;
+int num_buttons, bhist;
+
+int main(int argc, char **argv)
+{
+	glutInit(&argc, argv);
+	glutInitWindowSize(800, 600);
+	glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
+	glutCreateWindow("Joystick demo");
+
+	glutDisplayFunc(display);
+	glutReshapeFunc(reshape);
+	glutKeyboardFunc(keyboard);
+	glutJoystickFunc(joystick, 25);
+
+	if(!glutGet(GLUT_HAS_JOYSTICK)) {
+		fprintf(stderr, "no joystick detected\n");
+		return 1;
+	}
+	printf("Joystick axes: %d\n", glutGet(GLUT_JOYSTICK_AXES));
+	num_buttons = glutGet(GLUT_JOYSTICK_BUTTONS);
+	printf("Joystick buttons: %d\n", num_buttons);
+
+	glutMainLoop();
+}
+
+#define WSZ		0.8
+#define RAD		(WSZ / 8)
+#define FRM		0.0075
+#define MAX_BSZ	(WSZ / 9)
+
+void display(void)
+{
+	float dmax = WSZ * 0.5f - RAD;
+	float jx, jy, jz, cury, bsz;
+	int i, num;
+
+	jx = joy0 / 1000.0f;
+	jy = joy1 / 1000.0f;
+	jz = joy2 / 1000.0f;
+
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glPushMatrix();
+	glTranslatef(-WSZ / 2, 0, 0);
+	widget(WSZ, WSZ, jx * dmax, -jy * dmax);
+	glPopMatrix();
+
+	glPushMatrix();
+	glTranslatef(WSZ / 2, 0, 0);
+	widget(RAD * 2, WSZ, 0, -jz * dmax);
+	glPopMatrix();
+
+	if(num_buttons > 0) {
+		num = num_buttons;
+	} else {
+		bhist |= joy_bmask;
+		num = 0;
+		while(num < 32 && bhist >> num) {
+			num++;
+		}
+	}
+
+	if(num) {
+		if(num > 32) num = 32;
+		bsz = 2.0 / (num * 1.4);
+
+		if(bsz > MAX_BSZ) bsz = MAX_BSZ;
+
+		glPushMatrix();
+		glTranslatef(-bsz * 1.4 * (num - 1) / 2, 0.7, 0);
+		for(i=0; i<num; i++) {
+			button(bsz, joy_bmask & (1 << i));
+			glTranslatef(bsz * 1.4, 0, 0);
+		}
+		glPopMatrix();
+	}
+
+	glColor3f(0, 1, 0);
+	cury = -2 * WSZ / 3;
+	text(-WSZ * 0.75, cury, "X: %d", joy0);
+	cury -= 0.08;
+	text(-WSZ * 0.75, cury, "Y: %d", joy1);
+	cury -= 0.08;
+	text(-WSZ * 0.75, cury, "Z: %d", joy2);
+
+	glutSwapBuffers();
+}
+
+void rect(float x0, float y0, float x1, float y1)
+{
+	glVertex2f(x0, y0);
+	glVertex2f(x1, y0);
+	glVertex2f(x1, y1);
+	glVertex2f(x0, y1);
+}
+
+void text(float x, float y, const char *fmt, ...)
+{
+	va_list ap;
+	char buf256, *s;
+
+	va_start(ap, fmt);
+	vsprintf(buf, fmt, ap);
+	va_end(ap);
+
+	glPushMatrix();
+	glLoadIdentity();
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	glLoadIdentity();
+
+	glRasterPos2f(x, y);
+
+	s = buf;
+	while(*s) {
+		glutBitmapCharacter(GLUT_BITMAP_9_BY_15, *s++);
+	}
+
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+	glPopMatrix();
+}
+
+void widget(float xsz, float ysz, float xpos, float ypos)
+{
+	int i;
+	float x, y, theta;
+
+	glBegin(GL_QUADS);
+	glColor3f(1, 1, 1);
+	rect(-xsz / 2 - FRM, -ysz / 2 - FRM, xsz / 2 + FRM, ysz / 2 + FRM);
+	glColor3f(0.1, 0.1, 0.1);
+	rect(-xsz / 2, -ysz / 2, xsz / 2, ysz / 2);
+	glEnd();
+
+	glBegin(GL_TRIANGLE_FAN);
+	glColor3f(1, 0, 0);
+	glVertex2f(xpos, ypos);
+	for(i=0; i<20; i++) {
+		theta = M_PI * 2 * i / 19.0;
+		x = cos(theta) * RAD;
+		y = sin(theta) * RAD;
+		glVertex2f(xpos + x, ypos + y);
+	}
+	glEnd();
+}
+
+void button(float sz, float state)
+{
+	glBegin(GL_QUADS);
+	glColor3f(1, 1, 1);
+	rect(-sz / 2 - FRM, -sz / 2 - FRM, sz / 2 + FRM, sz / 2 + FRM);
+
+	glColor3f(state ? 1 : 0.2, 0.2, 0.2);
+	rect(-sz / 2, -sz / 2, sz / 2, sz / 2);
+	glEnd();
+}
+
+void reshape(int x, int y)
+{
+	float aspect = (float)x / y;
+
+	win_width = x;
+	win_height = y;
+
+	glViewport(0, 0, x, y);

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/keyboard Added

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/keyboard/keyboard.c Added

@@ -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 str256;
+
+	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 fkeysskey - 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();
+}

_service:tar_scm:freeglut-3.0.0.tar.gz/progs/demos/multi-touch/multi-touch.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/multi-touch/multi-touch.c Changed

@@ -58,7 +58,7 @@
 glVertexPointer(2, GL_FLOAT, 0, square);
 for (d = 0; d < NUM_DEVICES; d++) {
 int c;
- for (c = 0; d < NUM_DEVICES; d++) {
+ for (c = 0; c < NUM_CURSORS; c++) {
 Cursor C = &cursorsdc;
 if (C->on) {
 glMatrixMode(GL_MODELVIEW);
@@ -109,8 +109,8 @@
 /* Using FG2.8 (reversed) prototype for now */
 /* void onMultiButton(int cursor_id, int button, int state, int x, int y) { */
 void onMultiButton(int cursor_id, int x, int y, int button, int state) {
- if (cursor_id > NUM_CURSORS) {
- fprintf(stderr, "cursor_id(%d) > NUM_CURSORS(%d)\n", cursor_id, NUM_CURSORS);
+ if (cursor_id >= NUM_CURSORS) {
+ fprintf(stderr, "cursor_id (%d) >= NUM_CURSORS (%d), out of slots\n", cursor_id, NUM_CURSORS);
 return;
 }
 if (button == 0) {
@@ -122,8 +122,8 @@
 }
 
 void onMultiMotion(int cursor_id, int x, int y) {
- if (cursor_id > NUM_CURSORS) {
- fprintf(stderr, "cursor_id(%d) > NUM_CURSORS(%d)\n", cursor_id, NUM_CURSORS);
+ if (cursor_id >= NUM_CURSORS) {
+ fprintf(stderr, "cursor_id (%d) >= NUM_CURSORS (%d), out of slots\n", cursor_id, NUM_CURSORS);
 return;
 }
 cursors0cursor_id.x = (float)x;

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/resizer Added

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/resizer/resizer.c Added

@@ -0,0 +1,395 @@
+#include <stdio.h>
+
+#include <GL/freeglut.h>
+
+int nWindow, nChildWindow = -1;
+int nLoopMain = 0;
+GLboolean bChildPosDone = GL_FALSE, bChildSizeDone = GL_FALSE;
+
+void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY );
+void Redisplay();
+void Reshape(int width, int height);
+void Position(int x, int y);
+void WindowStatus(int state);
+
+
+
+
+void DrawQuad()
+{
+ int width = glutGet(GLUT_WINDOW_WIDTH);
+ int height = glutGet(GLUT_WINDOW_HEIGHT);
+
+ glBegin(GL_QUADS);
+ glVertex2d(width*.25, height*.75);
+ glVertex2d(width*.75, height*.75);
+ glVertex2d(width*.75, height*.25);
+ glVertex2d(width*.25, height*.25);
+ glEnd();
+}
+
+void UnhideTimer(int window)
+{
+ glutSetWindow(window);
+ glutShowWindow();
+}
+
+void ChangeTitleTimer(int unused)
+{
+ glutSetIconTitle("new icon title");
+ glutSetWindowTitle("new test title");
+}
+
+void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY )
+{
+ switch (cChar)
+ {
+ case 27:
+ glutLeaveMainLoop();
+
+ break;
+
+
+ case 'f':
+ case 'F':
+ printf("main window toggle fullscreen\n");
+ glutFullScreenToggle();
+
+ break;
+
+
+ case 'r':
+ case 'R':
+ if (nChildWindow!=-1 && cChar=='r') /* Capital R always resizes the main window*/
+ {
+ glutSetWindow(nChildWindow);
+ printf("child window resize\n");
+ if (!bChildSizeDone)
+ glutReshapeWindow(glutGet(GLUT_WINDOW_WIDTH)+50,glutGet(GLUT_WINDOW_HEIGHT)+50);
+ else
+ glutReshapeWindow(glutGet(GLUT_WINDOW_WIDTH)-50,glutGet(GLUT_WINDOW_HEIGHT)-50);
+ bChildSizeDone = !bChildSizeDone;
+ }
+ else
+ {
+ glutSetWindow(nWindow);
+ printf("main window resize\n");
+ if (glutGet(GLUT_WINDOW_WIDTH)<400)
+ glutReshapeWindow(600,300);
+ else
+ glutReshapeWindow(300,300);
+ }
+
+ break;
+
+
+ case 'm':
+ case 'M':
+ if (nChildWindow!=-1 && cChar=='m') /* Capital M always moves the main window*/
+ {
+ glutSetWindow(nChildWindow);
+ /* The window position you request is relative to the top-left
+ * corner of the client area of the parent window.
+ */
+ if (!bChildPosDone)
+ glutPositionWindow(glutGet(GLUT_WINDOW_X)+50,glutGet(GLUT_WINDOW_Y)+50);
+ else
+ glutPositionWindow(glutGet(GLUT_WINDOW_X)-50,glutGet(GLUT_WINDOW_Y)-50);
+ bChildPosDone = !bChildPosDone;
+ }
+ else
+ {
+ glutSetWindow(nWindow);
+ printf("main window position\n");
+ /* The window position you request is the outer top-left of the window,
+ * the client area is at a different position if the window has borders
+ * and/or a title bar.
+ */
+ if (glutGet(GLUT_WINDOW_X)<400)
+ glutPositionWindow(600,300);
+ else
+ glutPositionWindow(300,300);
+ }
+
+ break;
+
+
+ case 'd':
+ case 'D':
+ if (nChildWindow!=-1 && cChar=='d') /* Capital D always moves+resizes the main window*/
+ {
+ glutSetWindow(nChildWindow);
+ if (!bChildPosDone)
+ glutPositionWindow(glutGet(GLUT_WINDOW_X)+50,glutGet(GLUT_WINDOW_Y)+50);
+ else
+ glutPositionWindow(glutGet(GLUT_WINDOW_X)-50,glutGet(GLUT_WINDOW_Y)-50);
+ bChildPosDone = !bChildPosDone;
+ if (!bChildSizeDone)
+ glutReshapeWindow(glutGet(GLUT_WINDOW_WIDTH)+50,glutGet(GLUT_WINDOW_HEIGHT)+50);
+ else
+ glutReshapeWindow(glutGet(GLUT_WINDOW_WIDTH)-50,glutGet(GLUT_WINDOW_HEIGHT)-50);
+ bChildSizeDone = !bChildSizeDone;
+ }
+ else
+ {
+ if (glutGet(GLUT_WINDOW_X)<400)
+ glutPositionWindow(600,300);
+ else
+ glutPositionWindow(300,300);
+ if (glutGet(GLUT_WINDOW_WIDTH)<400)
+ glutReshapeWindow(600,300);
+ else
+ glutReshapeWindow(300,300);
+ }
+ break;
+
+
+ case 'c':
+ case 'C':
+ if (nChildWindow==-1)
+ {
+ int width = glutGet(GLUT_WINDOW_WIDTH);
+ int height = glutGet(GLUT_WINDOW_HEIGHT);
+
+ /* open child window */
+ printf("open child window\n");
+
+ nChildWindow = glutCreateSubWindow(nWindow,(int)(width*.35),(int)(height*.35),(int)(width*.3),(int)(height*.3));
+ glutKeyboardFunc( SampleKeyboard );
+ glutDisplayFunc( Redisplay );
+ glutReshapeFunc( Reshape );
+ glutPositionFunc( Position );
+ glutWindowStatusFunc( WindowStatus );
+ }
+ else
+ {
+ /* close child window */
+ printf("close child window\n");
+ glutSetWindow(nWindow);
+ glutDestroyWindow(nChildWindow);
+ nChildWindow = -1;
+ bChildSizeDone = GL_FALSE;
+ bChildPosDone = GL_FALSE;
+ }
+ break;
+
+
+ case 'i':
+ case 'I':
+ glutIconifyWindow();
+ glutTimerFunc(1500, ChangeTitleTimer, 0);
+ break;
+
+
+ case 'h':
+ case 'H':
+ if (nChildWindow!=-1 && cChar=='h') /* Capital H always hides the main window*/
+ {
+ glutSetWindow(nChildWindow);
+ glutTimerFunc(2000, UnhideTimer, nChildWindow);
+ }
+ else
+ {
+ glutSetWindow(nWindow);
+ glutTimerFunc(2000, UnhideTimer, nWindow);
+ }
+ glutHideWindow();
+ break;
+
+ case 'p':

_service:tar_scm:freeglut-3.0.0.tar.gz/progs/demos/shapes/shapes.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/shapes/shapes.c Changed

@@ -5,10 +5,10 @@
 in OpenGLUT. It may also be useful to see which
 parameters control what behavior in the OpenGLUT
 objects.
- 
+
 Spinning wireframe and solid-shaded shapes are
 displayed. Some parameters can be adjusted.
- 
+
 Keys:
 - <tt>Esc &nbsp;</tt> Quit
 - <tt>q Q &nbsp;</tt> Quit
@@ -34,7 +34,7 @@
 
 \author Portions Copyright (C) 2004, the OpenGLUT project contributors. 
 OpenGLUT branched from freeglut in February, 2004.
- 
+
 \image html openglut_shapes.png OpenGLUT Geometric Shapes Demonstration
 \include demos/shapes/shapes.c
 */
@@ -63,7 +63,7 @@
 }
 
 /*
- * OpenGL 2+ shader mode needs some function and macro definitions, 
+ * OpenGL 2+ shader mode needs some function and macro definitions,
 * avoiding a dependency on additional libraries like GLEW or the
 * GL/glext.h header
 */
@@ -283,10 +283,10 @@
 GLint attrib = gl_GetAttribLocation(program, name);
 if (attrib == -1)
 {
- fprintf(stderr, "Warning: Could not bind attrib %s\n", name); 
+ fprintf(stderr, "Warning: Could not bind attrib %s\n", name);
 }
 
-		checkError ("getAttribOrUniformLocation");
+ checkError ("getAttribOrUniformLocation");
 return attrib;
 }
 else
@@ -294,16 +294,16 @@
 GLint uniform = gl_GetUniformLocation(program, name);
 if (uniform == -1)
 {
- fprintf(stderr, "Warning: Could not bind uniform %s\n", name); 
+ fprintf(stderr, "Warning: Could not bind uniform %s\n", name);
 }
 
-		checkError ("getAttribOrUniformLocation");
+ checkError ("getAttribOrUniformLocation");
 return uniform;
 }
 }
 
 GLuint program;
-GLint attribute_fg_coord = -1, attribute_fg_normal = -1; 
+GLint attribute_fg_coord = -1, attribute_fg_normal = -1;
 GLint uniform_m = -1, uniform_p = -1, uniform_m_3x3_inv_transp = -1;
 GLint shaderReady = 0; /* Set to 1 when all initialization went well, to -1 when shader somehow unusable. */
 
@@ -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();
 
@@ -800,10 +808,10 @@
 case '.':
 case '>': stacks++; break;
 
- case '9': 
+ case '9':
 case '(': if( depth > -1 ) depth--; break;
 
- case '0': 
+ case '0':
 case ')': ++depth; break;
 
 case 'P':
@@ -820,6 +828,11 @@
 function_index = 0;
 break;
 
+ case 'F':
+ case 'f':
+ flat ^= 1;
+ break;
+
 case 'N':
 case 'n': visNormals=!visNormals; break;

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/timer_callback Added

_service:tar_scm:freeglut-3.4.0.tar.gz/progs/demos/timer_callback/timer.c Added

@@ -0,0 +1,174 @@
+/* Timer (callback) demo
+ *
+ * Written by John Tsiombikas <nuclear@member.fsf.org>
+ * Modified by Vincent Simonetti
+ *
+ * A modification of the timer sample, but with this
+ * offering a use of the user-data callback.
+ */
+#include <stdio.h>
+#include <GL/freeglut.h>
+
+struct display_index_s
+{
+	/* color index will be advanced every time the timer expires */
+	int surround_color_index;
+	int center_color_index;
+};
+typedef struct display_index_s display_index_t;
+
+struct timer_state_s
+{
+	int* color_index_ptr;
+	int* timer_time_ptr;
+};
+typedef struct timer_state_s timer_state_t;
+
+struct menu_state_s
+{
+	int* timer_time_ptr;
+	int menu_id;
+};
+typedef struct menu_state_s menu_state_t;
+
+void disp(void* uptr);
+void timer_func(int which, void* uptr);
+
+const float color3 = {
+	{1, 0, 0},
+	{0, 1, 0},
+	{0, 0, 1},
+	{1, 1, 0},
+	{0, 1, 1},
+	{1, 0, 1}
+};
+const int timerInts = {
+ 250,
+ 500,
+ 1000
+};
+
+void createMenuEntries(menu_state_t* menuState)
+{
+	int i;
+ for (i = 0; i < sizeof(timerInts) / sizeof(*timerInts); i++)
+ {
+ char temp10 = {'\0'};
+ /* flag current value */
+ if ((*menuState->timer_time_ptr) == timerIntsi)
+ temp0 = '+';
+ else
+ temp0 = '-';
+
+ sprintf(temp + 1, " %4d ms", timerIntsi);
+
+ glutAddMenuEntry(temp, timerIntsi);
+ }
+}
+
+void updateMenuEntries(menu_state_t* menuState)
+{
+	int i;
+ for (i = 0; i < sizeof(timerInts) / sizeof(*timerInts); i++)
+ {
+ char temp10 = { '\0' };
+ /* flag current value */
+ if ((*menuState->timer_time_ptr) == timerIntsi)
+ temp0 = '+';
+ else
+ temp0 = '-';
+
+ sprintf(temp + 1, " %4d ms", timerIntsi);
+
+ glutChangeToMenuEntry(i+1, temp, timerIntsi);
+ }
+}
+
+void MenuHandler(int timerInt, void* user_ptr)
+{
+	menu_state_t* menuState;
+	
+	if (!user_ptr)
+	{
+		/* In case main menu is selected somehow */
+		return;
+	}
+
+	menuState = (menu_state_t*)user_ptr;
+
+	*menuState->timer_time_ptr = timerInt;
+	glutSetMenu(menuState->menu_id);
+	updateMenuEntries(menuState);
+}
+
+int main(int argc, char **argv)
+{
+	int timerSurroundInt = 1000, timerCenterInt = 500;
+	display_index_t displayIndex = { 0, 2 };
+	timer_state_t surroundTimerState = { &displayIndex.surround_color_index, &timerSurroundInt };
+	timer_state_t centerTimerState = { &displayIndex.center_color_index, &timerCenterInt };
+	menu_state_t surroundMenuState = { &timerSurroundInt, 0 };
+	menu_state_t centerMenuState = { &timerCenterInt, 0 };
+
+	glutInit(&argc, argv);
+	glutInitWindowSize(128, 128);
+	glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
+	glutCreateWindow("timer test");
+
+	glutDisplayFuncUcall(disp, &displayIndex);
+
+ /* get timer started, its reset in the timer function itself */
+ glutTimerFuncUcall(timerSurroundInt, timer_func, 1, &surroundTimerState);
+	glutTimerFuncUcall(timerCenterInt, timer_func, 2, &centerTimerState);
+
+ /* menus for setting timing */
+	surroundMenuState.menu_id = glutCreateMenuUcall(MenuHandler, &surroundMenuState);
+ createMenuEntries(&surroundMenuState);
+
+	centerMenuState.menu_id = glutCreateMenuUcall(MenuHandler, &centerMenuState);
+ createMenuEntries(&centerMenuState);
+
+ glutCreateMenuUcall(MenuHandler, NULL); /* doesn't matter, no clickable entries in this menu */
+ glutAddSubMenu("Center", centerMenuState.menu_id);
+ glutAddSubMenu("Surround", surroundMenuState.menu_id);
+ glutAttachMenu(GLUT_RIGHT_BUTTON);
+
+	glutMainLoop();
+	return 0;
+}
+
+void disp(void* user_ptr)
+{
+	const display_index_t* displayIndex;
+	int cidx, pcidx;
+
+	displayIndex = (display_index_t*)user_ptr;
+	
+	cidx = displayIndex->surround_color_index;
+	glClearColor(colorcidx0, colorcidx1, colorcidx2, 1);
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	pcidx = displayIndex->center_color_index;
+ glPointSize(10.f);
+ glColor3f(colorpcidx0, colorpcidx1, colorpcidx2);
+ glBegin(GL_POINTS);
+ glVertex2i(0,0);
+ glEnd();
+
+	glutSwapBuffers();
+}
+
+void timer_func(int which, void* user_ptr)
+{
+	const timer_state_t* timerState;
+	
+	timerState = (timer_state_t*)user_ptr;
+
+	/* advance the color index and trigger a redisplay */
+	*timerState->color_index_ptr = (*timerState->color_index_ptr + 1) % (sizeof color / sizeof *color);
+ 
+	glutPostRedisplay();
+
+	/* (re)set the timer callback and ask glut to call it in x ms */
+ glutTimerFuncUcall(*timerState->timer_time_ptr, timer_func, which, user_ptr);
+}

_service:tar_scm:freeglut-3.0.0.tar.gz/src/android/fg_input_devices_android.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/android/fg_input_devices_android.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/android/fg_main_android.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/android/fg_main_android.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/android/fg_main_android.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/android/fg_main_android.h Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/android/fg_window_android.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/android/fg_window_android.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/blackberry/fg_main_blackberry.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/blackberry/fg_main_blackberry.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/egl/fg_init_egl.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/egl/fg_init_egl.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/egl/fg_internal_egl.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/egl/fg_internal_egl.h Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/egl/fg_window_egl.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/egl/fg_window_egl.c Changed

@@ -27,6 +27,7 @@
 #include "fg_internal.h"
 
 int fghChooseConfig(EGLConfig* config) {
+ EGLint num_config;
 EGLint attributes32;
 int where = 0;
 ATTRIB_VAL(EGL_SURFACE_TYPE, EGL_WINDOW_BIT);
@@ -68,7 +69,6 @@
 ATTRIB_VAL(EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0);
 ATTRIB(EGL_NONE);
 
- EGLint num_config;
 if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
 attributes, config, 1, &num_config)) {
 fgWarning("eglChooseConfig: error %x\n", eglGetError());
@@ -94,7 +94,7 @@
 ATTRIB_VAL(EGL_CONTEXT_CLIENT_VERSION, fgState.MajorVersion);
 #ifdef EGL_CONTEXT_MINOR_VERSION
 if (fgDisplay.pDisplay.egl.MinorVersion >= 5) {
- // EGL_CONTEXT_CLIENT_VERSION == EGL_CONTEXT_MAJOR_VERSION
+ /* EGL_CONTEXT_CLIENT_VERSION == EGL_CONTEXT_MAJOR_VERSION */
 ATTRIB_VAL(EGL_CONTEXT_MINOR_VERSION, fgState.MinorVersion);
 }
 #endif
@@ -107,13 +107,13 @@
 }
 
 eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver);
- if (ver != fgState.MajorVersion) {
+ if (ver < fgState.MajorVersion) {
 fgError("Wrong GLES major version: %d\n", ver);
 }
 #ifdef EGL_CONTEXT_MINOR_VERSION
 if (fgDisplay.pDisplay.egl.MinorVersion >= 5) {
 eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_MINOR_VERSION, &ver);
- if (ver != fgState.MinorVersion) {
+ if (ver < fgState.MinorVersion) {
 fgError("Wrong GLES minor version: %d\n", ver);
 }
 }

_service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_callback_macros.h Added

@@ -0,0 +1,336 @@
+/*
+ * fg_callback_macros.h
+ *
+ * The freeglut library callback macro file.
+ *
+ * Copyright (C) 2016 Vincent Simonetti
+ * Creation date: Sat Jan 16 2016
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef FREEGLUT_CALLBACK_MACROS_H
+#define FREEGLUT_CALLBACK_MACROS_H
+
+/*
+ * ----------------------------------------------------------------------------------------------------------------------
+ * There are two sets of macros here. One is for executing window callbacks, the others are for setting window callbacks.
+ * ----------------------------------------------------------------------------------------------------------------------
+ */
+
+/*
+ * Compiler define: FG_COMPILER_SUPPORTS_VA_ARGS: if the compiler supports variadic macros
+ */
+
+/* What supports variadic macros based off Wikipedia article on it (GCC-like must support C99 or higher to use variadic macros) */
+#if (((defined(__GNUC__) && (__GNUC__ >= 3)) || \
+ (defined(__clang__))) && \
+ (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))) || \
+ (defined(_MSC_VER) && (_MSC_VER >= 1400)) || \
+ (defined(__BORLANDC__) && (__BORLANDC__ >= 0x570)) || \
+ (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x530))
+#define FG_COMPILER_SUPPORTS_VA_ARGS 1
+#else
+#define FG_COMPILER_SUPPORTS_VA_ARGS 0
+#endif
+
+/*
+ * --------------------------
+ * Executing window callbacks
+ * --------------------------
+ *
+ * Info:
+ *
+ * This took a while to figure out, so be sure try to understand what is happening so that you can ensure that whatever you
+ * change won't break other areas.
+ *
+ * If you are just adding a new callback/changing it's argument count, just go to the bottom of the file.
+ *
+ * This whole file exists purely for the sake of preventing the need to implement additional parsing logic for each callback
+ * to pass user arguments. Of course, the necessity to support older compilers means that, as seen in the line above, there
+ * is still a requirement to add/modify code to handle callbacks. If freeglut ever requires newer compilers (at minimum, ones
+ * that support C99 or higher), code can very slowly be removed from this file. Even better would be if the C standard eventually
+ * supports something similar to what GCC has implemented or offers an alternative. Another option is if C++ would be "allowed" by
+ * project maintaners, as then templates can be used and function overloading. Ironically, the template would probably look worse
+ * then the GCC macro, so maybe it's good to stay as is.
+ *
+ * Onto the different "versions" of macros:
+ *
+ * The first is for any compiler that supports C99 by default. It requires each callback to have a specific argument count
+ * passthrough macro. The only reason there are specific count macros is so that (see paraghraph below) don't need have their own
+ * set of callback macros. Ideally, there would only be ZERO and ONE_OR_MORE. This works by having callback-specific macros call a
+ * specific handler macro to return user data (ZERO) or return one or more arguments along with userData (ONE_OR_MORE) where, with
+ * variadic macros, it just reuses the arguments.
+ *
+ * The last macro set is for the poor individual who has to use a compiler that doesn't support C99 by default, or may not support
+ * it at all. Stuff like MSVC6... It works by having a specific-count macro that "extracts" each argument to have them reused without
+ * the parathesis.
+ *
+ * There is a 3rd macro set that only worked on GCC/Clang, and thus was removed (last seen in revision e9676fc of the GIT mirror.
+ * Not sure at this time what the SVN number is.) as it's a non-standard functionality.
+ */
+
+/*
+ * EXPAND_WCB() is used as:
+ *
+ * EXPAND_WCB( cbname )(( arg_list, userData ))
+ *
+ * ... where {(arg_list)} is the parameter list and userData is user
+ * provided data.
+ *
+ * This will take the arg_list and extend it by one argument, adding
+ * the argument "userData" to the end of the list.
+ *
+ * In order for this to work, each callback must have a define that
+ * properly handles the arguments as needed by the callback.
+ * This callback is in the format of EXPAND_WCB_SUB_<cbname>.
+ * Helper functions exist for zero to five parameters: EXPAND_WCB_ZERO,
+ * EXPAND_WCB_ONE, EXPAND_WCB_TWO, EXPAND_WCB_THREE< EXPAND_WCB_FOUR,
+ * and EXPAND_WCB_FIVE. Each handle the callback argument counts.
+ *
+ * An example for the "Entry" callback, where "Entry" is the cbname:
+ * typedef void (* FGCBEntry )( int );
+ * typedef void (* FGCBEntryUC)( int, FGCBUserData );
+ * #define EXPAND_WCB_SUB_Entry(args) EXPAND_WCB_ONE args
+ */
+
+#if FG_COMPILER_SUPPORTS_VA_ARGS
+
+#define EXPAND_WCB_UNPARAN(...) __VA_ARGS__
+#define EXPAND_WCB_ONE_OR_MORE(args, userData) ( EXPAND_WCB_UNPARAN args, userData )
+
+#define EXPAND_WCB_ONE(args, userData) EXPAND_WCB_ONE_OR_MORE( args, userData )
+#define EXPAND_WCB_TWO(args, userData) EXPAND_WCB_ONE_OR_MORE( args, userData )
+#define EXPAND_WCB_THREE(args, userData) EXPAND_WCB_ONE_OR_MORE( args, userData )
+#define EXPAND_WCB_FOUR(args, userData) EXPAND_WCB_ONE_OR_MORE( args, userData )
+#define EXPAND_WCB_FIVE(args, userData) EXPAND_WCB_ONE_OR_MORE( args, userData )
+
+#else
+
+#define EXPAND_WCB_EXTRACT_ONE_ARGS(arg1) arg1
+#define EXPAND_WCB_EXTRACT_TWO_ARGS(arg1, arg2) arg1, arg2
+#define EXPAND_WCB_EXTRACT_THREE_ARGS(arg1, arg2, arg3) arg1, arg2, arg3
+#define EXPAND_WCB_EXTRACT_FOUR_ARGS(arg1, arg2, arg3, arg4) arg1, arg2, arg3, arg4
+#define EXPAND_WCB_EXTRACT_FIVE_ARGS(arg1, arg2, arg3, arg4, arg5) arg1, arg2, arg3, arg4, arg5
+
+#define EXPAND_WCB_ONE(args, userData) (EXPAND_WCB_EXTRACT_ONE_ARGS args, userData)
+#define EXPAND_WCB_TWO(args, userData) (EXPAND_WCB_EXTRACT_TWO_ARGS args, userData)
+#define EXPAND_WCB_THREE(args, userData) (EXPAND_WCB_EXTRACT_THREE_ARGS args, userData)
+#define EXPAND_WCB_FOUR(args, userData) (EXPAND_WCB_EXTRACT_FOUR_ARGS args, userData)
+#define EXPAND_WCB_FIVE(args, userData) (EXPAND_WCB_EXTRACT_FIVE_ARGS args, userData)
+
+#endif
+
+#define EXPAND_WCB_ZERO(args, userData) ( userData )
+
+#define EXPAND_WCB(cbname) EXPAND_WCB_SUB_ ## cbname
+
+/*
+ * Freeglut callbacks type definitions macros
+ *
+ * Every time a callback is updated in fg_internal.h is updated, this needs updated
+ * if argument counts change, new callbacks are added, or callbacks are removed.
+ */
+
+#define EXPAND_WCB_SUB_Display(args) EXPAND_WCB_ZERO args
+#define EXPAND_WCB_SUB_Reshape(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_Position(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_Visibility(args) EXPAND_WCB_ONE args
+#define EXPAND_WCB_SUB_Keyboard(args) EXPAND_WCB_THREE args
+#define EXPAND_WCB_SUB_KeyboardUp(args) EXPAND_WCB_THREE args
+#define EXPAND_WCB_SUB_Special(args) EXPAND_WCB_THREE args
+#define EXPAND_WCB_SUB_SpecialUp(args) EXPAND_WCB_THREE args
+#define EXPAND_WCB_SUB_Mouse(args) EXPAND_WCB_FOUR args
+#define EXPAND_WCB_SUB_MouseWheel(args) EXPAND_WCB_FOUR args
+#define EXPAND_WCB_SUB_Motion(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_Passive(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_Entry(args) EXPAND_WCB_ONE args
+#define EXPAND_WCB_SUB_WindowStatus(args) EXPAND_WCB_ONE args
+#define EXPAND_WCB_SUB_Joystick(args) EXPAND_WCB_FOUR args
+#define EXPAND_WCB_SUB_OverlayDisplay(args) EXPAND_WCB_ZERO args
+#define EXPAND_WCB_SUB_SpaceMotion(args) EXPAND_WCB_THREE args
+#define EXPAND_WCB_SUB_SpaceRotation(args) EXPAND_WCB_THREE args
+#define EXPAND_WCB_SUB_SpaceButton(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_Dials(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_ButtonBox(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_TabletMotion(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_TabletButton(args) EXPAND_WCB_FOUR args
+#define EXPAND_WCB_SUB_Destroy(args) EXPAND_WCB_ZERO args
+#define EXPAND_WCB_SUB_MultiEntry(args) EXPAND_WCB_TWO args
+#define EXPAND_WCB_SUB_MultiButton(args) EXPAND_WCB_FIVE args
+#define EXPAND_WCB_SUB_MultiMotion(args) EXPAND_WCB_THREE args
+#define EXPAND_WCB_SUB_MultiPassive(args) EXPAND_WCB_THREE args
+#define EXPAND_WCB_SUB_InitContext(args) EXPAND_WCB_ZERO args
+#define EXPAND_WCB_SUB_AppStatus(args) EXPAND_WCB_ONE args
+
+/*
+ * ------------------------
+ * Setting window callbacks
+ * ------------------------
+ *
+ * These originally existed in fg_callbacks.c
+ */
+
+/*
+ * All of the window-specific callbacks setting methods can be generalized to this:
+ */
+#define SET_CURRENT_WINDOW_CALLBACK(a) \
+do \
+{ \
+ if( fgStructure.CurrentWindow == NULL ) \
+ return; \
+ SET_WCB( ( *( fgStructure.CurrentWindow ) ), a, callback, userData ); \
+} while( 0 )
+

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_callbacks.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_callbacks.c Changed

@@ -30,23 +30,26 @@
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
-
 /*
  * Global callbacks.
  */
+
 /* Sets the global idle callback */
-void FGAPIENTRY glutIdleFunc( FGCBIdle callback )
+void FGAPIENTRY glutIdleFuncUcall( FGCBIdleUC callback, FGCBUserData userData )
 {
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutIdleFunc" );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutIdleFuncUcall" );
     fgState.IdleCallback = callback;
+    fgState.IdleCallbackData = userData;
 }
 
+IMPLEMENT_GLUT_CALLBACK_FUNC_ARG0(Idle)
+
 /* Creates a timer and sets its callback */
-void FGAPIENTRY glutTimerFunc( unsigned int timeOut, FGCBTimer callback, int timerID )
+void FGAPIENTRY glutTimerFuncUcall( unsigned int timeOut, FGCBTimerUC callback, int timerID, FGCBUserData userData )
 {
     SFG_Timer *timer, *node;
 
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutTimerFunc" );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutTimerFuncUcall" );
 
     if( (timer = fgState.FreeTimers.Last) )
     {
@@ -59,9 +62,10 @@
                      "Memory allocation failure in glutTimerFunc()" );
     }
 
-    timer->Callback  = callback;
-    timer->ID        = timerID;
-    timer->TriggerTime = fgElapsedTime() + timeOut;
+    timer->Callback     = callback;
+    timer->CallbackData = userData;
+    timer->ID           = timerID;
+    timer->TriggerTime  = fgElapsedTime() + timeOut;
 
     /* Insert such that timers are sorted by end-time */
     for( node = fgState.Timers.First; node; node = node->Node.Next )
@@ -70,7 +74,21 @@
             break;
     }
 
-    fgListInsert( &fgState.Timers, &node->Node, &timer->Node );
+    fgListInsert( &fgState.Timers, node ? &node->Node : 0, &timer->Node );
+}
+
+IMPLEMENT_CALLBACK_FUNC_CB_ARG1(Timer, Timer)
+
+void FGAPIENTRY glutTimerFunc( unsigned int timeOut, FGCBTimer callback, int timerID )
+{
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutTimerFunc" );
+    if( callback )
+    {
+        FGCBTimer* reference = &callback;
+        glutTimerFuncUcall( timeOut, fghTimerFuncCallback, timerID, *((FGCBUserData*)reference) );
+    }
+    else
+        glutTimerFuncUcall( timeOut, NULL, timerID, NULL );
 }
 
 /* Deprecated version of glutMenuStatusFunc callback setting method */
@@ -81,102 +99,92 @@
 }
 
 /* Sets the global menu status callback for the current window */
-void FGAPIENTRY glutMenuStatusFunc( FGCBMenuStatus callback )
+void FGAPIENTRY glutMenuStatusFuncUcall( FGCBMenuStatusUC callback, FGCBUserData userData )
 {
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMenuStatusFunc" );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMenuStatusFuncUcall" );
     fgState.MenuStatusCallback = callback;
+    fgState.MenuStatusCallbackData = userData;
 }
 
+IMPLEMENT_GLUT_CALLBACK_FUNC_ARG3(MenuStatus)
 
 /*
  * Menu specific callbacks.
  */
 /* Callback upon menu destruction */
-void FGAPIENTRY glutMenuDestroyFunc( FGCBDestroy callback )
+void FGAPIENTRY glutMenuDestroyFuncUcall( FGCBDestroyUC callback, FGCBUserData userData )
 {
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMenuDestroyFunc" );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMenuDestroyFuncUcall" );
     if( fgStructure.CurrentMenu )
+    {
         fgStructure.CurrentMenu->Destroy = callback;
+        fgStructure.CurrentMenu->DestroyData = userData;
+    }
 }
 
-
-/*
- * All of the window-specific callbacks setting methods can be generalized to this:
- */
-#define SET_CALLBACK(a)                                         \
-do                                                              \
-{                                                               \
-    if( fgStructure.CurrentWindow == NULL )                     \
-        return;                                                 \
-    SET_WCB( ( *( fgStructure.CurrentWindow ) ), a, callback ); \
-} while( 0 )
-/*
- * And almost every time the callback setter function can be implemented like this:
- */
-#define IMPLEMENT_CALLBACK_FUNC_2NAME(a,b)                      \
-void FGAPIENTRY glut##a##Func( FGCB##b callback )               \
-{                                                               \
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glut"#a"Func" );    \
-    SET_CALLBACK( b );                                          \
-}
-#define IMPLEMENT_CALLBACK_FUNC(a) IMPLEMENT_CALLBACK_FUNC_2NAME(a,a)
+IMPLEMENT_GLUT_CALLBACK_FUNC_ARG0_2NAME(MenuDestroy, Destroy)
 
 /* Implement all these callback setter functions... */
-IMPLEMENT_CALLBACK_FUNC(Position)
-IMPLEMENT_CALLBACK_FUNC(Keyboard)
-IMPLEMENT_CALLBACK_FUNC(KeyboardUp)
-IMPLEMENT_CALLBACK_FUNC(Special)
-IMPLEMENT_CALLBACK_FUNC(SpecialUp)
-IMPLEMENT_CALLBACK_FUNC(Mouse)
-IMPLEMENT_CALLBACK_FUNC(MouseWheel)
-IMPLEMENT_CALLBACK_FUNC(Motion)
-IMPLEMENT_CALLBACK_FUNC_2NAME(PassiveMotion,Passive)
-IMPLEMENT_CALLBACK_FUNC(Entry)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG2(Position)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG3_USER(Keyboard,unsigned char,int,int)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG3_USER(KeyboardUp,unsigned char,int,int)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG3(Special)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG3(SpecialUp)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG4(Mouse)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG4(MouseWheel)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG2(Motion)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG2_2NAME(PassiveMotion,Passive)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG1(Entry)
 /* glutWMCloseFunc is an alias for glutCloseFunc; both set the window's Destroy callback */
-IMPLEMENT_CALLBACK_FUNC_2NAME(Close,Destroy)
-IMPLEMENT_CALLBACK_FUNC_2NAME(WMClose,Destroy)
-IMPLEMENT_CALLBACK_FUNC(OverlayDisplay)
-IMPLEMENT_CALLBACK_FUNC(WindowStatus)
-IMPLEMENT_CALLBACK_FUNC(ButtonBox)
-IMPLEMENT_CALLBACK_FUNC(Dials)
-IMPLEMENT_CALLBACK_FUNC(TabletMotion)
-IMPLEMENT_CALLBACK_FUNC(TabletButton)
-IMPLEMENT_CALLBACK_FUNC(MultiEntry)
-IMPLEMENT_CALLBACK_FUNC(MultiButton)
-IMPLEMENT_CALLBACK_FUNC(MultiMotion)
-IMPLEMENT_CALLBACK_FUNC(MultiPassive)
-IMPLEMENT_CALLBACK_FUNC(InitContext)
-IMPLEMENT_CALLBACK_FUNC(AppStatus)
-
-
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG0_2NAME(Close,Destroy)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG0_2NAME(WMClose,Destroy)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG0(OverlayDisplay)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG1(WindowStatus)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG2(ButtonBox)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG2(Dials)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG2(TabletMotion)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG4(TabletButton)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG2(MultiEntry)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG5(MultiButton)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG3(MultiMotion)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG3(MultiPassive)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG0(InitContext)
+IMPLEMENT_CURRENT_WINDOW_CALLBACK_FUNC_ARG1(AppStatus)
 
 /*
  * Sets the Display callback for the current window
  */
-void FGAPIENTRY glutDisplayFunc( FGCBDisplay callback )
+void FGAPIENTRY glutDisplayFuncUcall( FGCBDisplayUC callback, FGCBUserData userData )
 {
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutDisplayFunc" );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutDisplayFuncUcall" );
     if( !callback )
         fgError( "Fatal error in program.  NULL display callback not "
                  "permitted in GLUT 3.0+ or freeglut 2.0.1+" );
-    SET_CALLBACK( Display );
+    SET_CURRENT_WINDOW_CALLBACK( Display );
 }
 
-void fghDefaultReshape(int width, int height)
+IMPLEMENT_GLUT_CALLBACK_FUNC_ARG0(Display)
+
+void fghDefaultReshape( int width, int height, FGCBUserData userData )
 {
     glViewport( 0, 0, width, height );
 }
 
-void FGAPIENTRY glutReshapeFunc( FGCBReshape callback )

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_display.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_display.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_ext.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_ext.c Changed

@@ -210,6 +210,46 @@
     CHECK_NAME(glutSetVertexAttribCoord3);
     CHECK_NAME(glutSetVertexAttribNormal);
     CHECK_NAME(glutSetVertexAttribTexCoord2);
+
+    /* freeglut user callback functions */
+    CHECK_NAME(glutCreateMenuUcall);
+    CHECK_NAME(glutTimerFuncUcall);
+    CHECK_NAME(glutIdleFuncUcall);
+    CHECK_NAME(glutKeyboardFuncUcall);
+    CHECK_NAME(glutSpecialFuncUcall);
+    CHECK_NAME(glutReshapeFuncUcall);
+    CHECK_NAME(glutVisibilityFuncUcall);
+    CHECK_NAME(glutDisplayFuncUcall);
+    CHECK_NAME(glutMouseFuncUcall);
+    CHECK_NAME(glutMotionFuncUcall);
+    CHECK_NAME(glutPassiveMotionFuncUcall);
+    CHECK_NAME(glutEntryFuncUcall);
+    CHECK_NAME(glutKeyboardUpFuncUcall);
+    CHECK_NAME(glutSpecialUpFuncUcall);
+    CHECK_NAME(glutJoystickFuncUcall);
+    CHECK_NAME(glutMenuStatusFuncUcall);
+    CHECK_NAME(glutOverlayDisplayFuncUcall);
+    CHECK_NAME(glutWindowStatusFuncUcall);
+    CHECK_NAME(glutSpaceballMotionFuncUcall);
+    CHECK_NAME(glutSpaceballRotateFuncUcall);
+    CHECK_NAME(glutSpaceballButtonFuncUcall);
+    CHECK_NAME(glutButtonBoxFuncUcall);
+    CHECK_NAME(glutDialsFuncUcall);
+    CHECK_NAME(glutTabletMotionFuncUcall);
+    CHECK_NAME(glutTabletButtonFuncUcall);
+    CHECK_NAME(glutMouseWheelFuncUcall);
+    CHECK_NAME(glutPositionFuncUcall);
+    CHECK_NAME(glutCloseFuncUcall);
+    CHECK_NAME(glutWMCloseFuncUcall);
+    CHECK_NAME(glutMenuDestroyFuncUcall);
+    CHECK_NAME(glutMultiEntryFuncUcall);
+    CHECK_NAME(glutMultiButtonFuncUcall);
+    CHECK_NAME(glutMultiMotionFuncUcall);
+    CHECK_NAME(glutMultiPassiveFuncUcall);
+    CHECK_NAME(glutInitErrorFuncUcall);
+    CHECK_NAME(glutInitWarningFuncUcall);
+    CHECK_NAME(glutInitContextFuncUcall);
+    CHECK_NAME(glutAppStatusFuncUcall);
 #undef CHECK_NAME
 
     return NULL;

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_font.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_font.c Changed

@@ -114,7 +114,19 @@
      */
     face = font->Characters character ;
 
+#ifdef GL_VERSION_1_1
     glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
+#else
+	{
+	GLint swbytes, lsbfirst, rowlen, skiprows, skippix, align;
+
+	glGetIntegerv(GL_UNPACK_SWAP_BYTES, &swbytes);
+	glGetIntegerv(GL_UNPACK_LSB_FIRST, &lsbfirst);
+	glGetIntegerv(GL_UNPACK_ROW_LENGTH, &rowlen);
+	glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skiprows);
+	glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skippix);
+	glGetIntegerv(GL_UNPACK_ALIGNMENT, &align);
+#endif
     glPixelStorei( GL_UNPACK_SWAP_BYTES,  GL_FALSE );
     glPixelStorei( GL_UNPACK_LSB_FIRST,   GL_FALSE );
     glPixelStorei( GL_UNPACK_ROW_LENGTH,  0        );
@@ -127,7 +139,17 @@
         ( float )( face 0  ), 0.0,  /* The raster advance -- inc. x,y */
         ( face + 1 )                  /* The packed bitmap data...      */
     );
-    glPopClientAttrib( );
+#ifdef GL_VERSION_1_1
+    glPopClientAttrib();
+#else
+	glPixelStorei(GL_UNPACK_SWAP_BYTES, swbytes);
+	glPixelStorei(GL_UNPACK_LSB_FIRST, lsbfirst);
+	glPixelStorei(GL_UNPACK_ROW_LENGTH, rowlen);
+	glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows);
+	glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippix);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, align);
+	}
+#endif
 }
 
 void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
@@ -145,7 +167,19 @@
     if ( !string || ! *string )
         return;
 
+#ifdef GL_VERSION_1_1
     glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
+#else
+	{
+	GLint swbytes, lsbfirst, rowlen, skiprows, skippix, align;
+
+	glGetIntegerv(GL_UNPACK_SWAP_BYTES, &swbytes);
+	glGetIntegerv(GL_UNPACK_LSB_FIRST, &lsbfirst);
+	glGetIntegerv(GL_UNPACK_ROW_LENGTH, &rowlen);
+	glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skiprows);
+	glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skippix);
+	glGetIntegerv(GL_UNPACK_ALIGNMENT, &align);
+#endif
     glPixelStorei( GL_UNPACK_SWAP_BYTES,  GL_FALSE );
     glPixelStorei( GL_UNPACK_LSB_FIRST,   GL_FALSE );
     glPixelStorei( GL_UNPACK_ROW_LENGTH,  0        );
@@ -178,7 +212,17 @@
             x += ( float )( face 0  );
         }
 
-    glPopClientAttrib( );
+#ifdef GL_VERSION_1_1
+    glPopClientAttrib();
+#else
+	glPixelStorei(GL_UNPACK_SWAP_BYTES, swbytes);
+	glPixelStorei(GL_UNPACK_LSB_FIRST, lsbfirst);
+	glPixelStorei(GL_UNPACK_ROW_LENGTH, rowlen);
+	glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows);
+	glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippix);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, align);
+	}
+#endif
 }
 
 /*

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_font_data.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_font_data.c Changed

@@ -4,7 +4,7 @@
 */
 
 /*
- * This file has been automatically generated by the 
+ * This file has been automatically generated by the
 * genfonts utility.
 *
 * The legal status of this file is a bit vague. The font glyphs
@@ -31,7 +31,7 @@
 *
 * Copyright (c) 1999-2000 by Pawel W. Olszta
 * Written by Pawel W. Olszta, <olszta@sourceforge.net>
- * 
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
@@ -55,7 +55,7 @@
 
 /*
 * The following bitmapped fonts are defined in this file:
- * 
+ *
 * 1. fgFontFixed8x13
 * -misc-fixed-medium-r-normal--13-120-75-75-C-80-iso8859-1
 * 2. fgFontFixed9x15
@@ -199,6 +199,7 @@
 static const GLubyte Fixed8x13_Character_124 = { 8, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 16, 16, 0, 0};
 static const GLubyte Fixed8x13_Character_125 = { 8, 0, 0, 0,112, 8, 8, 16, 12, 16, 8, 8,112, 0, 0};
 static const GLubyte Fixed8x13_Character_126 = { 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 84, 36, 0, 0};
+/*
 static const GLubyte Fixed8x13_Character_127 = { 9, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0};
 static const GLubyte Fixed8x13_Character_128 = { 9, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0};
 static const GLubyte Fixed8x13_Character_129 = { 9, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0};
@@ -232,6 +233,7 @@
 static const GLubyte Fixed8x13_Character_157 = { 9, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0};
 static const GLubyte Fixed8x13_Character_158 = { 9, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0};
 static const GLubyte Fixed8x13_Character_159 = { 9, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0};
+*/
 static const GLubyte Fixed8x13_Character_160 = { 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Fixed8x13_Character_161 = { 8, 0, 0, 0, 16, 16, 16, 16, 16, 16, 16, 0, 16, 0, 0};
 static const GLubyte Fixed8x13_Character_162 = { 8, 0, 0, 0, 0, 16, 56, 84, 80, 80, 84, 56, 16, 0, 0};
@@ -348,7 +350,7 @@
 Fixed8x13_Character_240,Fixed8x13_Character_241,Fixed8x13_Character_242,Fixed8x13_Character_243,Fixed8x13_Character_244,Fixed8x13_Character_245,Fixed8x13_Character_246,Fixed8x13_Character_247,Fixed8x13_Character_248,Fixed8x13_Character_249,Fixed8x13_Character_250,Fixed8x13_Character_251,Fixed8x13_Character_252,Fixed8x13_Character_253,Fixed8x13_Character_254,Fixed8x13_Character_255,NULL};
 
 /* The font structure: */
-const SFG_Font fgFontFixed8x13 = { "-misc-fixed-medium-r-normal--13-120-75-75-C-80-iso8859-1", 256, 14, Fixed8x13_Character_Map, 0, 3 };
+SFG_Font fgFontFixed8x13 = { "-misc-fixed-medium-r-normal--13-120-75-75-C-80-iso8859-1", 256, 14, Fixed8x13_Character_Map, 0, 3 };
 
 static const GLubyte Fixed9x15_Character_000 = { 9, 0, 0, 0, 0, 0, 0, 0, 0, 91, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0,109, 0, 0, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_001 = { 9, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 28, 0, 62, 0,127, 0,255,128,127, 0, 62, 0, 28, 0, 8, 0, 0, 0, 0, 0, 0, 0};
@@ -477,6 +479,7 @@
 static const GLubyte Fixed9x15_Character_124 = { 9, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_125 = { 9, 0, 0, 0, 0, 0, 0,112, 0, 8, 0, 8, 0, 8, 0, 16, 0, 12, 0, 12, 0, 16, 0, 8, 0, 8, 0, 8, 0,112, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_126 = { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, 73, 0, 49, 0, 0, 0, 0, 0};
+/*
 static const GLubyte Fixed9x15_Character_127 = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 91, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0,109, 0, 0, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_128 = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 91, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0,109, 0, 0, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_129 = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 91, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0,109, 0, 0, 0, 0, 0};
@@ -510,6 +513,7 @@
 static const GLubyte Fixed9x15_Character_157 = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 91, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0,109, 0, 0, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_158 = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 91, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0,109, 0, 0, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_159 = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 91, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0, 65, 0, 64, 0, 1, 0,109, 0, 0, 0, 0, 0};
+*/
 static const GLubyte Fixed9x15_Character_160 = { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_161 = { 9, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 8, 0, 8, 0, 0, 0};
 static const GLubyte Fixed9x15_Character_162 = { 9, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 60, 0, 82, 0, 80, 0, 72, 0, 74, 0, 60, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -626,8 +630,9 @@
 Fixed9x15_Character_240,Fixed9x15_Character_241,Fixed9x15_Character_242,Fixed9x15_Character_243,Fixed9x15_Character_244,Fixed9x15_Character_245,Fixed9x15_Character_246,Fixed9x15_Character_247,Fixed9x15_Character_248,Fixed9x15_Character_249,Fixed9x15_Character_250,Fixed9x15_Character_251,Fixed9x15_Character_252,Fixed9x15_Character_253,Fixed9x15_Character_254,Fixed9x15_Character_255,NULL};
 
 /* The font structure: */
-const SFG_Font fgFontFixed9x15 = { "-misc-fixed-medium-r-normal--15-140-75-75-C-90-iso8859-1", 256, 16, Fixed9x15_Character_Map, 0, 4 };
+SFG_Font fgFontFixed9x15 = { "-misc-fixed-medium-r-normal--15-140-75-75-C-90-iso8859-1", 256, 16, Fixed9x15_Character_Map, 0, 4 };
 
+/*
 static const GLubyte Helvetica10_Character_000 = { 8, 0, 0, 0, 84, 0, 68, 0, 68, 0, 84, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_001 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_002 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -660,6 +665,7 @@
 static const GLubyte Helvetica10_Character_029 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_030 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_031 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+*/
 static const GLubyte Helvetica10_Character_032 = { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_033 = { 3, 0, 0, 0, 64, 0, 64, 64, 64, 64, 64, 64, 0, 0, 0};
 static const GLubyte Helvetica10_Character_034 = { 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 0, 0, 0};
@@ -755,6 +761,7 @@
 static const GLubyte Helvetica10_Character_124 = { 3, 0, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 0, 0};
 static const GLubyte Helvetica10_Character_125 = { 3, 0,128, 64, 64, 64, 64, 32, 64, 64, 64,128, 0, 0, 0};
 static const GLubyte Helvetica10_Character_126 = { 7, 0, 0, 0, 0, 0, 0,152,100, 0, 0, 0, 0, 0, 0};
+/*
 static const GLubyte Helvetica10_Character_127 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_128 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_129 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -788,6 +795,7 @@
 static const GLubyte Helvetica10_Character_157 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_158 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_159 = { 13, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+*/
 static const GLubyte Helvetica10_Character_160 = { 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_161 = { 3, 0, 64, 64, 64, 64, 64, 64, 0, 64, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica10_Character_162 = { 6, 0, 0, 64,112,168,160,160,168,112, 16, 0, 0, 0, 0};
@@ -904,8 +912,9 @@
 Helvetica10_Character_240,Helvetica10_Character_241,Helvetica10_Character_242,Helvetica10_Character_243,Helvetica10_Character_244,Helvetica10_Character_245,Helvetica10_Character_246,Helvetica10_Character_247,Helvetica10_Character_248,Helvetica10_Character_249,Helvetica10_Character_250,Helvetica10_Character_251,Helvetica10_Character_252,Helvetica10_Character_253,Helvetica10_Character_254,Helvetica10_Character_255,NULL};
 
 /* The font structure: */
-const SFG_Font fgFontHelvetica10 = { "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1", 256, 14, Helvetica10_Character_Map, 0, 3 };
+SFG_Font fgFontHelvetica10 = { "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1", 256, 14, Helvetica10_Character_Map, 0, 3 };
 
+/*
 static const GLubyte Helvetica12_Character_000 = { 9, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_001 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_002 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
@@ -938,6 +947,7 @@
 static const GLubyte Helvetica12_Character_029 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_030 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_031 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
+*/
 static const GLubyte Helvetica12_Character_032 = { 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_033 = { 3, 0, 0, 0, 0, 64, 0, 64, 64, 64, 64, 64, 64, 64, 0, 0, 0};
 static const GLubyte Helvetica12_Character_034 = { 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 0, 0, 0};
@@ -1033,6 +1043,7 @@
 static const GLubyte Helvetica12_Character_124 = { 3, 0, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 0, 0};
 static const GLubyte Helvetica12_Character_125 = { 4, 0,192, 32, 32, 32, 32, 32, 16, 32, 32, 32, 32,192, 0, 0, 0};
 static const GLubyte Helvetica12_Character_126 = { 7, 0, 0, 0, 0, 0, 0, 0,152,100, 0, 0, 0, 0, 0, 0, 0};
+/*
 static const GLubyte Helvetica12_Character_127 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_128 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_129 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
@@ -1066,6 +1077,7 @@
 static const GLubyte Helvetica12_Character_157 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_158 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_159 = { 12, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 65, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 0};
+*/
 static const GLubyte Helvetica12_Character_160 = { 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_161 = { 3, 0, 64, 64, 64, 64, 64, 64, 64, 64, 0, 64, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica12_Character_162 = { 7, 0, 0, 0, 32, 56,100, 80, 80, 80, 84, 56, 8, 0, 0, 0, 0};
@@ -1182,8 +1194,9 @@
 Helvetica12_Character_240,Helvetica12_Character_241,Helvetica12_Character_242,Helvetica12_Character_243,Helvetica12_Character_244,Helvetica12_Character_245,Helvetica12_Character_246,Helvetica12_Character_247,Helvetica12_Character_248,Helvetica12_Character_249,Helvetica12_Character_250,Helvetica12_Character_251,Helvetica12_Character_252,Helvetica12_Character_253,Helvetica12_Character_254,Helvetica12_Character_255,NULL};
 
 /* The font structure: */
-const SFG_Font fgFontHelvetica12 = { "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1", 256, 16, Helvetica12_Character_Map, 0, 4 };
+SFG_Font fgFontHelvetica12 = { "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1", 256, 16, Helvetica12_Character_Map, 0, 4 };
 
+/*
 static const GLubyte Helvetica18_Character_000 = { 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 64, 16, 0, 0, 64, 16, 0, 0, 64, 16, 0, 0, 64, 16, 0, 0, 64, 16, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_001 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_002 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -1216,6 +1229,7 @@
 static const GLubyte Helvetica18_Character_029 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_030 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_031 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+*/
 static const GLubyte Helvetica18_Character_032 = { 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_033 = { 6, 0, 0, 0, 0, 0, 48, 48, 0, 0, 32, 32, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_034 = { 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144,216,216,216, 0, 0, 0, 0};
@@ -1311,6 +1325,7 @@
 static const GLubyte Helvetica18_Character_124 = { 4, 0, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_125 = { 6, 0,192, 96, 48, 48, 48, 48, 48, 48, 24, 12, 24, 48, 48, 48, 48, 48, 96,192, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_126 = { 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,102, 0, 63, 0, 25,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+/*
 static const GLubyte Helvetica18_Character_127 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_128 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_129 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -1344,6 +1359,7 @@
 static const GLubyte Helvetica18_Character_157 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_158 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_159 = { 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+*/
 static const GLubyte Helvetica18_Character_160 = { 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_161 = { 6, 0, 48, 48, 48, 48, 48, 48, 48, 48, 16, 16, 0, 0, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte Helvetica18_Character_162 = { 10, 0, 0, 0, 0, 0, 0, 8, 0, 8, 0, 31, 0, 63,128, 53,128,100, 0,100, 0,100, 0,100, 0, 53,128, 63,128, 31, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -1460,8 +1476,9 @@
 Helvetica18_Character_240,Helvetica18_Character_241,Helvetica18_Character_242,Helvetica18_Character_243,Helvetica18_Character_244,Helvetica18_Character_245,Helvetica18_Character_246,Helvetica18_Character_247,Helvetica18_Character_248,Helvetica18_Character_249,Helvetica18_Character_250,Helvetica18_Character_251,Helvetica18_Character_252,Helvetica18_Character_253,Helvetica18_Character_254,Helvetica18_Character_255,NULL};
 
 /* The font structure: */
-const SFG_Font fgFontHelvetica18 = { "-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1", 256, 23, Helvetica18_Character_Map, 0, 5 };
+SFG_Font fgFontHelvetica18 = { "-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1", 256, 23, Helvetica18_Character_Map, 0, 5 };
 
+/*
 static const GLubyte TimesRoman10_Character_000 = { 8, 0, 0, 0, 0,170, 0,130, 0,130, 0,170, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_001 = { 13, 0, 0, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_002 = { 13, 0, 0, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0, 0, 0};
@@ -1494,6 +1511,7 @@
 static const GLubyte TimesRoman10_Character_029 = { 13, 0, 0, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_030 = { 13, 0, 0, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_031 = { 13, 0, 0, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0, 0, 0};
+*/
 static const GLubyte TimesRoman10_Character_032 = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_033 = { 3, 0, 0, 0, 0, 64, 0, 64, 64, 64, 64, 64, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_034 = { 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,160,160, 0, 0, 0};
@@ -1589,6 +1607,7 @@
 static const GLubyte TimesRoman10_Character_124 = { 2, 0, 0,128,128,128,128,128,128,128,128,128, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_125 = { 4, 0, 0,128, 64, 64, 64, 32, 64, 64, 64,128, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_126 = { 7, 0, 0, 0, 0, 0, 0,152,100, 0, 0, 0, 0, 0, 0};
+/*
 static const GLubyte TimesRoman10_Character_127 = { 13, 0, 0, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_128 = { 13, 0, 0, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0, 0, 0};
 static const GLubyte TimesRoman10_Character_129 = { 13, 0, 0, 0, 0, 0, 0, 0, 0,170, 0, 0, 0,130, 0, 0, 0,130, 0, 0, 0,170, 0, 0, 0, 0, 0, 0, 0};

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_geometry.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_geometry.c Changed

@@ -44,23 +44,29 @@
 
 /* declare for drawing using the different OpenGL versions here so we can
 have a nice code order below */
+#ifndef GL_VERSION_1_1
+static void fghDrawGeometryWire10(GLfloat *varr, GLfloat *narr, GLushort *iarr,
+		GLsizei nparts, GLsizei npartverts, GLenum prim, GLushort *iarr2,
+		GLsizei nparts2, GLsizei npartverts2);
+static void fghDrawGeometrySolid10(GLfloat *varr, GLfloat *narr, GLfloat *tarr,
+		GLsizei nverts, GLushort *iarr, GLsizei nparts, GLsizei npartverts);
+static void fghDrawNormalVisualization10(void);
+#endif
 static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals,
 GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode,
- GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2
- );
+ GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2);
 static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices,
 GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart);
 static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei numVertices,
 GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode,
 GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2,
- GLint attribute_v_coord, GLint attribute_v_normal
- );
+ GLint attribute_v_coord, GLint attribute_v_normal);
 static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices,
 GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart,
 GLint attribute_v_coord, GLint attribute_v_normal, GLint attribute_v_texture);
 /* declare function for generating visualization of normals */
 static void fghGenerateNormalVisualization(GLfloat *vertices, GLfloat *normals, GLsizei numVertices);
-static void fghDrawNormalVisualization11();
+static void fghDrawNormalVisualization11(void);
 static void fghDrawNormalVisualization20(GLint attribute_v_coord);
 
 /* Drawing geometry:
@@ -79,11 +85,11 @@
 * issuing one draw call per face. glDrawArrays is always used as no
 * triangle decomposition is needed to draw faces. We use the "first"
 * parameter in glDrawArrays to go from face to face.
- * 
+ *
 * Non-polyhedra:
 * - We have implemented the sphere, cylinder, cone and torus.
 * - All shapes are characterized by two parameters: the number of
- * subdivisions along two axes used to construct the shape's vertices 
+ * subdivisions along two axes used to construct the shape's vertices
 * (e.g. stacks and slices for the sphere).
 * As different subdivisions are most suitable for different shapes,
 * and are thus also named differently, I wont provide general comments
@@ -91,7 +97,7 @@
 * - Solids are drawn using glDrawArrays and GL_TRIANGLE_STRIP. Each
 * strip covers one revolution around one of the two subdivision axes
 * of the shape.
- * - WireFrame drawing is done for the subdivisions along the two axes 
+ * - WireFrame drawing is done for the subdivisions along the two axes
 * separately, usually using GL_LINE_LOOP. Vertex index arrays are
 * built containing the vertices to be drawn for each loop, which are
 * then drawn using multiple calls to glDrawElements. As the number of
@@ -134,8 +140,10 @@
 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 */
@@ -178,11 +186,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 +207,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,13 +216,114 @@
 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();
 }
 }
 
+#ifndef GL_VERSION_1_1
+static void fghDrawGeometryWire10(GLfloat *varr, GLfloat *narr, GLushort *iarr,
+		GLsizei nparts, GLsizei npartverts, GLenum prim, GLushort *iarr2,
+		GLsizei nparts2, GLsizei npartverts2)
+{
+	int i, j;
+	GLfloat *vptr, *nptr;
+	GLushort *iptr;
+
+	if(!iarr) {
+		vptr = varr;
+		nptr = narr;
+		for(i=0; i<nparts; i++) {
+			glBegin(prim);
+			for(j=0; j<npartverts; j++) {
+				glNormal3fv(nptr); nptr += 3;
+				glVertex3fv(vptr); vptr += 3;
+			}
+			glEnd();
+		}
+	} else {
+		iptr = iarr;
+		for(i=0; i<nparts; i++) {
+			glBegin(prim);
+			for(j=0; j<npartverts; j++) {
+				int idx = *iptr++;
+				idx = idx * 2 + idx;
+				glNormal3fv(narr + idx);
+				glVertex3fv(varr + idx);
+			}
+			glEnd();
+		}
+	}
+
+	if(iarr2) {
+		iptr = iarr2;
+		for(i=0; i<nparts2; i++) {
+			glBegin(GL_LINE_LOOP);
+			for(j=0; j<npartverts2; j++) {
+				int idx = *iptr++;
+				idx = idx * 2 + idx;
+				glNormal3fv(narr + idx);
+				glVertex3fv(varr + idx);
+			}
+			glEnd();
+		}
+	}
+}
 
+static void fghDrawGeometrySolid10(GLfloat *varr, GLfloat *narr, GLfloat *tarr,
+		GLsizei nverts, GLushort *iarr, GLsizei nparts, GLsizei npartverts)
+{
+ int i, j;
+	GLfloat *vptr, *nptr, *tptr;
+	GLushort *iptr;
+
+	if(!iarr) {
+		vptr = varr;
+		nptr = narr;
+		tptr = tarr;
+		glBegin(GL_TRIANGLES);
+		for(i=0; i<nverts; i++) {
+			if(tarr) {
+				glTexCoord2fv(tptr); tptr += 2;
+			}
+			glNormal3fv(nptr); nptr += 3;
+			glVertex3fv(vptr); vptr += 3;
+		}
+		glEnd();
+		return;
+	}
+
+	iptr = iarr;
+	if(nparts > 1) {
+		for(i=0; i<nparts; i++) {
+			glBegin(GL_TRIANGLE_STRIP);
+			for(j=0; j<npartverts; j++) {
+				int idx = *iptr++;
+				if(tarr) {
+					glTexCoord2fv(tarr + idx * 2);
+				}
+				idx = idx * 2 + idx;
+				glNormal3fv(narr + idx);
+				glVertex3fv(varr + idx);
+			}
+			glEnd();
+		}

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_gl2.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_gl2.c Changed

@@ -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;
@@ -42,21 +56,22 @@
         fgStructure.CurrentWindow->Window.attribute_v_texture = attrib;
 }
 
+#define LOADFUNC(ptr, type, name)	\
+	do { if(!(ptr = (type)glutGetProcAddress(name))) return; } while(0)
+
 void fgInitGL2() {
 #ifdef GL_ES_VERSION_2_0
     fgState.HasOpenGL20 = (fgState.MajorVersion >= 2);
 #else
     /* TODO: Mesa returns a valid stub function, rather than NULL,
        when we request a non-existent function */
-#define CHECK(func, a) if ((a) == NULL) { fgWarning("fgInitGL2: " func " is NULL"); return; }
-    CHECK("fghGenBuffers", fghGenBuffers = (FGH_PFNGLGENBUFFERSPROC)glutGetProcAddress("glGenBuffers"));
-    CHECK("fghDeleteBuffers", fghDeleteBuffers = (FGH_PFNGLDELETEBUFFERSPROC)glutGetProcAddress("glDeleteBuffers"));
-    CHECK("fghBindBuffer", fghBindBuffer = (FGH_PFNGLBINDBUFFERPROC)glutGetProcAddress("glBindBuffer"));
-    CHECK("fghBufferData", fghBufferData = (FGH_PFNGLBUFFERDATAPROC)glutGetProcAddress("glBufferData"));
-    CHECK("fghVertexAttribPointer", fghVertexAttribPointer = (FGH_PFNGLVERTEXATTRIBPOINTERPROC)glutGetProcAddress("glVertexAttribPointer"));
-    CHECK("fghEnableVertexAttribArray", fghEnableVertexAttribArray = (FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC)glutGetProcAddress("glEnableVertexAttribArray"));
-    CHECK("fghDisableVertexAttribArray", fghDisableVertexAttribArray = (FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC)glutGetProcAddress("glDisableVertexAttribArray"));
-#undef CHECK
+    LOADFUNC(fghGenBuffers, FGH_PFNGLGENBUFFERSPROC, "glGenBuffers");
+    LOADFUNC(fghDeleteBuffers, FGH_PFNGLDELETEBUFFERSPROC, "glDeleteBuffers");
+    LOADFUNC(fghBindBuffer, FGH_PFNGLBINDBUFFERPROC, "glBindBuffer");
+    LOADFUNC(fghBufferData, FGH_PFNGLBUFFERDATAPROC, "glBufferData");
+    LOADFUNC(fghVertexAttribPointer, FGH_PFNGLVERTEXATTRIBPOINTERPROC, "glVertexAttribPointer");
+    LOADFUNC(fghEnableVertexAttribArray, FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC, "glEnableVertexAttribArray");
+    LOADFUNC(fghDisableVertexAttribArray, FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC, "glDisableVertexAttribArray");
     fgState.HasOpenGL20 = 1;
 #endif
 }

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_gl2.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_gl2.h Changed

@@ -1,5 +1,5 @@
 /*
- * fg_gl2.c
+ * fg_gl2.h
  *
  * Load OpenGL (ES) 2.0 functions used by fg_geometry
  *
@@ -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

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_init.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_init.c Changed

@@ -70,9 +70,11 @@
                       { NULL, NULL },         /* Timers */
                       { NULL, NULL },         /* FreeTimers */
                       NULL,                   /* IdleCallback */
+                      NULL,                   /* IdleCallbackData */
                       0,                      /* ActiveMenus */
                       NULL,                   /* MenuStateCallback */
                       NULL,                   /* MenuStatusCallback */
+                      NULL,                   /* MenuStatusCallbackData */
                       FREEGLUT_MENU_FONT,
                       { -1, -1, GL_TRUE },    /* GameModeSize */
                       -1,                     /* GameModeDepth */
@@ -88,13 +90,16 @@
                       4,                      /* SampleNumber */
                       GL_FALSE,               /* SkipStaleMotion */
                       GL_FALSE,               /* StrokeFontDrawJoinDots */
+                      GL_FALSE,               /* AllowNegativeWindowPosition */
                       1,                      /* OpenGL context MajorVersion */
                       0,                      /* OpenGL context MinorVersion */
                       0,                      /* OpenGL ContextFlags */
                       0,                      /* OpenGL ContextProfile */
                       0,                      /* HasOpenGL20 */
                       NULL,                   /* ErrorFunc */
-                      NULL                    /* WarningFunc */
+                      NULL,                   /* ErrorFuncData */
+                      NULL,                   /* WarningFunc */
+                      NULL                    /* WarningFuncData */
 };
 
 
@@ -297,9 +302,11 @@
     fgListInit( &fgState.Timers );
     fgListInit( &fgState.FreeTimers );
 
-    fgState.IdleCallback = NULL;
-    fgState.MenuStateCallback = ( FGCBMenuState )NULL;
-    fgState.MenuStatusCallback = ( FGCBMenuStatus )NULL;
+    fgState.IdleCallback           = ( FGCBIdleUC )NULL;
+    fgState.IdleCallbackData       = NULL;
+    fgState.MenuStateCallback      = ( FGCBMenuState )NULL;
+    fgState.MenuStatusCallback     = ( FGCBMenuStatusUC )NULL;
+    fgState.MenuStatusCallbackData = NULL;
 
     fgState.SwapCount   = 0;
     fgState.SwapTime    = 0;
@@ -318,7 +325,7 @@
 
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-#if defined(NEED_XPARSEGEOMETRY_IMPL)
+#if defined(NEED_XPARSEGEOMETRY_IMPL) || defined(TARGET_HOST_MS_WINDOWS)
 #   include "util/xparsegeometry_repl.h"
 #endif
 
@@ -357,7 +364,7 @@
      * size.
      */
 
-    if (geometry )
+    if ( geometry )
     {
         unsigned int parsedWidth, parsedHeight;
         int mask = XParseGeometry( geometry,
@@ -370,10 +377,10 @@
         if( (mask & (WidthValue|HeightValue)) == (WidthValue|HeightValue) )
             fgState.Size.Use = GL_TRUE;
 
-        if( mask & XNegative )
+        if( ( mask & XNegative ) && !fgState.AllowNegativeWindowPosition )
             fgState.Position.X += fgDisplay.ScreenWidth - fgState.Size.X;
 
-        if( mask & YNegative )
+        if( ( mask & YNegative ) && !fgState.AllowNegativeWindowPosition )
             fgState.Position.Y += fgDisplay.ScreenHeight - fgState.Size.Y;
 
         if( (mask & (XValue|YValue)) == (XValue|YValue) )
@@ -397,7 +404,7 @@
     fgState.Position.X = x;
     fgState.Position.Y = y;
 
-    if( ( x >= 0 ) && ( y >= 0 ) )
+    if( ( ( x >= 0 ) && ( y >= 0 ) ) || fgState.AllowNegativeWindowPosition )
         fgState.Position.Use = GL_TRUE;
     else
         fgState.Position.Use = GL_FALSE;
@@ -667,19 +674,59 @@
 /*
  * Sets the user error handler (note the use of va_list for the args to the fmt)
  */
-void FGAPIENTRY glutInitErrorFunc( FGError callback )
+void FGAPIENTRY glutInitErrorFuncUcall( FGErrorUC callback, FGCBUserData userData )
 {
     /* This allows user programs to handle freeglut errors */
     fgState.ErrorFunc = callback;
+    fgState.ErrorFuncData = userData;
+}
+
+static void fghInitErrorFuncCallback( const char *fmt, va_list ap, FGCBUserData userData )
+{
+    FGError* callback = (FGError*)&userData;
+    (*callback)( fmt, ap );
+}
+
+void FGAPIENTRY glutInitErrorFunc( FGError callback )
+{
+    if (callback)
+    {
+        FGError* reference = &callback;
+        glutInitErrorFuncUcall( fghInitErrorFuncCallback, *((FGCBUserData*)reference) );
+    }
+    else
+    {
+        glutInitErrorFuncUcall( NULL, NULL );
+    }
 }
 
 /*
  * Sets the user warning handler (note the use of va_list for the args to the fmt)
  */
-void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
+void FGAPIENTRY glutInitWarningFuncUcall( FGWarningUC callback, FGCBUserData userData )
 {
     /* This allows user programs to handle freeglut warnings */
     fgState.WarningFunc = callback;
+    fgState.WarningFuncData = userData;
+}
+
+static void fghInitWarningFuncCallback( const char *fmt, va_list ap, FGCBUserData userData )
+{
+    FGWarning* callback = (FGWarning*)&userData;
+    (*callback)( fmt, ap );
+}
+
+void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
+{
+    if (callback)
+    {
+        FGWarning* reference = &callback;
+        glutInitWarningFuncUcall( fghInitWarningFuncCallback, *((FGCBUserData*)reference) );
+    }
+    else
+    {
+        glutInitWarningFuncUcall( NULL, NULL );
+    }
 }
 
 /*** END OF FILE ***/

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_input_devices.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_input_devices.c Changed

@@ -71,11 +71,11 @@
 
 /*****************************************************************/
 
-extern SERIALPORT *serial_open ( const char *device );
-extern void serial_close ( SERIALPORT *port );
-extern int serial_getchar ( SERIALPORT *port );
-extern int serial_putchar ( SERIALPORT *port, unsigned char ch );
-extern void serial_flush ( SERIALPORT *port );
+extern SERIALPORT *fg_serial_open ( const char *device );
+extern void fg_serial_close ( SERIALPORT *port );
+extern int fg_serial_getchar ( SERIALPORT *port );
+extern int fg_serial_putchar ( SERIALPORT *port, unsigned char ch );
+extern void fg_serial_flush ( SERIALPORT *port );
 
 extern void fgPlatformRegisterDialDevice ( const char *dial_device );
 static void send_dial_event(int dial, int value);
@@ -111,11 +111,11 @@
     {
         const char *dial_device=NULL;
         dial_device = getenv ( "GLUT_DIALS_SERIAL" );
-		fgPlatformRegisterDialDevice ( dial_device );
+        fgPlatformRegisterDialDevice ( dial_device );
 
         if ( !dial_device ) return;
-        if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
-        serial_putchar(dialbox_port,DIAL_INITIALIZE);
+        if ( !( dialbox_port = fg_serial_open ( dial_device ) ) ) return;
+        fg_serial_putchar(dialbox_port,DIAL_INITIALIZE);
         glutTimerFunc ( 10, poll_dials, 0 );
         fgState.InputDevsInitialised = GL_TRUE;
     }
@@ -128,7 +128,7 @@
 {
     if ( fgState.InputDevsInitialised )
     {
-        serial_close ( dialbox_port );
+        fg_serial_close ( dialbox_port );
         dialbox_port = NULL;
         fgState.InputDevsInitialised = GL_FALSE;
     }
@@ -165,7 +165,7 @@
 
     if ( !dialbox_port ) return;
 
-    while ( (data=serial_getchar(dialbox_port)) != EOF )
+    while ( (data=fg_serial_getchar(dialbox_port)) != EOF )
     {
         if ( ( dial_state > DIAL_WHICH_DEVICE ) || IS_DIAL_EVENT ( data ) )
         {
@@ -194,12 +194,12 @@
         {
             fgState.InputDevsInitialised = GL_TRUE;
             dial_state = DIAL_WHICH_DEVICE;
-            serial_putchar(dialbox_port,DIAL_SET_AUTO_DIALS);
-            serial_putchar(dialbox_port,0xff);
-            serial_putchar(dialbox_port,0xff);
+            fg_serial_putchar(dialbox_port,DIAL_SET_AUTO_DIALS);
+            fg_serial_putchar(dialbox_port,0xff);
+            fg_serial_putchar(dialbox_port,0xff);
         }
         else  /* Unknown data; try flushing. */
-            serial_flush(dialbox_port);
+            fg_serial_flush(dialbox_port);
     }
 
     glutTimerFunc ( 2, poll_dials, 0 );

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_internal.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_internal.h Changed

@@ -33,12 +33,14 @@
 #endif
 
 #include "fg_version.h"
+#include "fg_callback_macros.h"
 
 /* Freeglut is intended to function under all Unix/X11 and Win32 platforms. */
 /* XXX: Don't all MS-Windows compilers (except Cygwin) have _WIN32 defined?
 * XXX: If so, remove the first set of defined()'s below.
 */
-#if !defined(TARGET_HOST_POSIX_X11) && !defined(TARGET_HOST_MS_WINDOWS) && !defined(TARGET_HOST_MAC_OSX) && !defined(TARGET_HOST_SOLARIS)
+#if !defined(TARGET_HOST_POSIX_X11) && !defined(TARGET_HOST_MS_WINDOWS) && !defined(TARGET_HOST_MAC_OSX) && !defined(TARGET_HOST_SOLARIS) && \
+ !defined(TARGET_HOST_ANDROID) && !defined(TARGET_HOST_BLACKBERRY) && !defined(TARGET_HOST_POSIX_WAYLAND)
 #if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__MINGW32__) \
 || defined(_WIN32) || defined(_WIN32_WCE) \
 || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) )
@@ -50,8 +52,12 @@
 #elif defined (__QNXNTO__) || defined (__PLAYBOOK__)
 # define TARGET_HOST_BLACKBERRY 1
 
-#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)
-# define TARGET_HOST_POSIX_X11 1
+#elif defined(__posix__) || defined(unix) || defined(__unix__) || defined(__linux__) || defined(__sun)
+# if defined(FREEGLUT_WAYLAND)
+# define TARGET_HOST_POSIX_WAYLAND 1
+# else
+# define TARGET_HOST_POSIX_X11 1
+# endif
 
 #elif defined(__APPLE__)
 /* This is a placeholder until we get native OSX support ironed out -- JFF 11/18/09 */
@@ -70,32 +76,36 @@
 #endif
 
 #ifndef TARGET_HOST_MS_WINDOWS
-# define TARGET_HOST_MS_WINDOWS 0
+# define TARGET_HOST_MS_WINDOWS 0
 #endif
 
 #ifndef TARGET_HOST_ANDROID
-# define TARGET_HOST_ANDROID 0
+# define TARGET_HOST_ANDROID 0
 #endif
 
 #ifndef TARGET_HOST_BLACKBERRY
-# define TARGET_HOST_BLACKBERRY 0
+# define TARGET_HOST_BLACKBERRY 0
+#endif
+
+#ifndef TARGET_HOST_POSIX_WAYLAND
+# define TARGET_HOST_POSIX_WAYLAND 0
 #endif
 
 #ifndef TARGET_HOST_POSIX_X11
-# define TARGET_HOST_POSIX_X11 0
+# define TARGET_HOST_POSIX_X11 0
 #endif
 
 #ifndef TARGET_HOST_MAC_OSX
-# define TARGET_HOST_MAC_OSX 0
+# define TARGET_HOST_MAC_OSX 0
 #endif
 
 #ifndef TARGET_HOST_SOLARIS
-# define TARGET_HOST_SOLARIS 0
+# define TARGET_HOST_SOLARIS 0
 #endif
 
 /* -- FIXED CONFIGURATION LIMITS ------------------------------------------- */
 
-#define FREEGLUT_MAX_MENUS 3
+#define FREEGLUT_MAX_MENUS 3
 
 /* These files should be available on every platform. */
 #include <stdio.h>
@@ -129,9 +139,6 @@
 */
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 # define HAVE_USB_JS 1
-# if defined(__NetBSD__) || ( defined(__FreeBSD__) && __FreeBSD_version >= 500000)
-# define HAVE_USBHID_H 1
-# endif
 #endif
 
 #if defined(_MSC_VER) || defined(__WATCOMC__)
@@ -188,6 +195,9 @@
 #endif
 
 /* Platform-specific includes */
+#if TARGET_HOST_POSIX_WAYLAND
+#include "wayland/fg_internal_wl.h"
+#endif
 #if TARGET_HOST_POSIX_X11
 #include "x11/fg_internal_x11.h"
 #endif
@@ -204,52 +214,97 @@
 
 /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
 
-/* Freeglut callbacks type definitions */
-typedef void (* FGCBDisplay )( void );
-typedef void (* FGCBReshape )( int, int );
-typedef void (* FGCBPosition )( int, int );
-typedef void (* FGCBVisibility )( int );
-typedef void (* FGCBKeyboard )( unsigned char, int, int );
-typedef void (* FGCBKeyboardUp )( unsigned char, int, int );
-typedef void (* FGCBSpecial )( int, int, int );
-typedef void (* FGCBSpecialUp )( int, int, int );
-typedef void (* FGCBMouse )( int, int, int, int );
-typedef void (* FGCBMouseWheel )( int, int, int, int );
-typedef void (* FGCBMotion )( int, int );
-typedef void (* FGCBPassive )( int, int );
-typedef void (* FGCBEntry )( int );
-typedef void (* FGCBWindowStatus )( int );
-typedef void (* FGCBJoystick )( unsigned int, int, int, int );
-typedef void (* FGCBOverlayDisplay)( void );
-typedef void (* FGCBSpaceMotion )( int, int, int );
-typedef void (* FGCBSpaceRotation )( int, int, int );
-typedef void (* FGCBSpaceButton )( int, int );
-typedef void (* FGCBDials )( int, int );
-typedef void (* FGCBButtonBox )( int, int );
-typedef void (* FGCBTabletMotion )( int, int );
-typedef void (* FGCBTabletButton )( int, int, int, int );
-typedef void (* FGCBDestroy )( void ); /* Used for both window and menu destroy callbacks */
-
-typedef void (* FGCBMultiEntry )( int, int );
-typedef void (* FGCBMultiButton )( int, int, int, int, int );
-typedef void (* FGCBMultiMotion )( int, int, int );
-typedef void (* FGCBMultiPassive )( int, int, int );
-
-typedef void (* FGCBInitContext)();
-typedef void (* FGCBAppStatus)(int);
+/*
+ * Freeglut callbacks type definitions
+ *
+ * If anything here is modified or added, update fg_callback_macros.h functions.
+ *
+ * This is not ideal, but freeglut needs to either define minimal compiler specs,
+ * or update header every time this is changed or updated.
+ */
+typedef void* FGCBUserData;
+
+typedef void (* FGCBDisplay )( void );
+typedef void (* FGCBDisplayUC )( FGCBUserData );
+typedef void (* FGCBReshape )( int, int );
+typedef void (* FGCBReshapeUC )( int, int, FGCBUserData );
+typedef void (* FGCBPosition )( int, int );
+typedef void (* FGCBPositionUC )( int, int, FGCBUserData );
+typedef void (* FGCBVisibility )( int );
+typedef void (* FGCBVisibilityUC )( int, FGCBUserData );
+typedef void (* FGCBKeyboard )( unsigned char, int, int );
+typedef void (* FGCBKeyboardUC )( unsigned char, int, int, FGCBUserData );
+typedef void (* FGCBKeyboardUp )( unsigned char, int, int );
+typedef void (* FGCBKeyboardUpUC )( unsigned char, int, int, FGCBUserData );
+typedef void (* FGCBSpecial )( int, int, int );
+typedef void (* FGCBSpecialUC )( int, int, int, FGCBUserData );
+typedef void (* FGCBSpecialUp )( int, int, int );
+typedef void (* FGCBSpecialUpUC )( int, int, int, FGCBUserData );
+typedef void (* FGCBMouse )( int, int, int, int );
+typedef void (* FGCBMouseUC )( int, int, int, int, FGCBUserData );
+typedef void (* FGCBMouseWheel )( int, int, int, int );
+typedef void (* FGCBMouseWheelUC )( int, int, int, int, FGCBUserData );
+typedef void (* FGCBMotion )( int, int );
+typedef void (* FGCBMotionUC )( int, int, FGCBUserData );
+typedef void (* FGCBPassive )( int, int );
+typedef void (* FGCBPassiveUC )( int, int, FGCBUserData );
+typedef void (* FGCBEntry )( int );
+typedef void (* FGCBEntryUC )( int, FGCBUserData );
+typedef void (* FGCBWindowStatus )( int );
+typedef void (* FGCBWindowStatusUC )( int, FGCBUserData );
+typedef void (* FGCBJoystick )( unsigned int, int, int, int );
+typedef void (* FGCBJoystickUC )( unsigned int, int, int, int, FGCBUserData );
+typedef void (* FGCBOverlayDisplay )( void );
+typedef void (* FGCBOverlayDisplayUC)( FGCBUserData );
+typedef void (* FGCBSpaceMotion )( int, int, int );
+typedef void (* FGCBSpaceMotionUC )( int, int, int, FGCBUserData );
+typedef void (* FGCBSpaceRotation )( int, int, int );
+typedef void (* FGCBSpaceRotationUC )( int, int, int, FGCBUserData );
+typedef void (* FGCBSpaceButton )( int, int );
+typedef void (* FGCBSpaceButtonUC )( int, int, FGCBUserData );
+typedef void (* FGCBDials )( int, int );
+typedef void (* FGCBDialsUC )( int, int, FGCBUserData );
+typedef void (* FGCBButtonBox )( int, int );
+typedef void (* FGCBButtonBoxUC )( int, int, FGCBUserData );
+typedef void (* FGCBTabletMotion )( int, int );
+typedef void (* FGCBTabletMotionUC )( int, int, FGCBUserData );
+typedef void (* FGCBTabletButton )( int, int, int, int );
+typedef void (* FGCBTabletButtonUC )( int, int, int, int, FGCBUserData );
+typedef void (* FGCBDestroy )( void ); /* Used for both window and menu destroy callbacks */
+typedef void (* FGCBDestroyUC )( FGCBUserData );
+
+typedef void (* FGCBMultiEntry )( int, int );
+typedef void (* FGCBMultiEntryUC )( int, int, FGCBUserData );
+typedef void (* FGCBMultiButton )( int, int, int, int, int );
+typedef void (* FGCBMultiButtonUC )( int, int, int, int, int, FGCBUserData );
+typedef void (* FGCBMultiMotion )( int, int, int );
+typedef void (* FGCBMultiMotionUC )( int, int, int, FGCBUserData );
+typedef void (* FGCBMultiPassive )( int, int, int );
+typedef void (* FGCBMultiPassiveUC )( int, int, int, FGCBUserData );
+

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_joystick.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_joystick.c Changed

@@ -40,239 +40,6 @@
 #define JS_TRUE 1
 #define JS_FALSE 0
 
-/* BSD defines from "jsBSD.cxx" around lines 42-270 */
-
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-
-# ifdef HAVE_USB_JS
-# if defined(__NetBSD__)
-/* XXX The below hack is done until freeglut's autoconf is updated. */
-# define HAVE_USBHID_H 1
-# ifdef HAVE_USBHID_H
-# include <usbhid.h>
-# else
-# include <usb.h>
-# endif
-# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-# ifdef HAVE_USBHID_H
-# include <usbhid.h>
-# else
-# include <libusbhid.h>
-# endif
-# endif
-# include <legacy/dev/usb/usb.h>
-# include <dev/usb/usbhid.h>
-
-/* Compatibility with older usb.h revisions */
-# if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
-# define USB_MAX_DEVNAMES MAXDEVNAMES
-# endif
-# endif
-
-static int hatmap_x9 = { 0, 0, 1, 1, 1, 0, -1, -1, -1 };
-static int hatmap_y9 = { 0, 1, 1, 0, -1, -1, -1, 0, 1 };
-struct os_specific_s {
- char fname 128 ;
- int fd;
- int is_analog;
- /* The following structure members are specific to analog joysticks */
- struct joystick ajs;
-# ifdef HAVE_USB_JS
- /* The following structure members are specific to USB joysticks */
- struct hid_item *hids;
- int hid_dlen;
- int hid_offset;
- char *hid_data_buf;
- int axes_usage _JS_MAX_AXES ;
-# endif
- /* We keep button and axes state ourselves, as they might not be updated
- * on every read of a USB device
- */
- int cache_buttons;
- float cache_axes _JS_MAX_AXES ;
-};
-
-/* Idents lower than USB_IDENT_OFFSET are for analog joysticks. */
-# define USB_IDENT_OFFSET 2
-
-# define USBDEV "/dev/usb"
-# define UHIDDEV "/dev/uhid"
-# define AJSDEV "/dev/joy"
-
-# ifdef HAVE_USB_JS
-/*
- * fghJoystickFindUSBdev (and its helper, fghJoystickWalkUSBdev) try to locate
- * the full name of a USB device. If /dev/usbN isn't readable, we punt and
- * return the uhidN device name. We warn the user of this situation once.
- */
-static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
-{
- struct usb_device_info di;
- int i, a;
- char *cp;
-
- for (a = 1; a < USB_MAX_DEVICES; a++) {
- di.udi_addr = a;
- if (ioctl(f, USB_DEVICEINFO, &di) != 0)
- return NULL;
- for (i = 0; i < USB_MAX_DEVNAMES; i++)
- if (di.udi_devnamesi0 &&
- strcmp(di.udi_devnamesi, dev) == 0) {
- cp = calloc( 1, strlen(di.udi_vendor) + strlen(di.udi_product) + 2);
- strcpy(cp, di.udi_vendor);
- strcat(cp, " ");
- strcat(cp, di.udi_product);
- strncpy(out, cp, outlen - 1);
- outoutlen - 1 = 0;
- free( cp );
- return out;
- }
- }
- return NULL;
-}
-
-static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
-{
- int i, f;
- char buf50;
- char *cp;
- static int protection_warned = 0;
-
- for (i = 0; i < 16; i++) {
- snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
- f = open(buf, O_RDONLY);
- if (f >= 0) {
- cp = fghJoystickWalkUSBdev(f, name, out, outlen);
- close(f);
- if (cp)
- return 1;
- }
- else if (errno == EACCES) {
- if (!protection_warned) {
- fgWarning ( "Can't open %s for read!", buf );
- protection_warned = 1;
- }
- }
- }
- return 0;
-}
-
-static int fghJoystickInitializeHID(struct os_specific_s *os,
- int *num_axes, int *num_buttons)
-{
- int size, is_joystick;
-# ifdef HAVE_USBHID_H
- int report_id = 0;
-# endif
- struct hid_data *d;
- struct hid_item h;
- report_desc_t rd;
-
- if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
- {
- fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
- return FALSE;
- }
-
- os->hids = NULL;
-
-# ifdef HAVE_USBHID_H
- if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
- {
- /*** XXX {report_id} may not be the right variable? ***/
- fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
- return FALSE;
- }
-
- size = hid_report_size( rd, hid_input, report_id );
-# else
- size = hid_report_size( rd, 0, hid_input );
-# endif
- os->hid_data_buf = calloc( 1, size );
- os->hid_dlen = size;
-
- is_joystick = 0;
-# ifdef HAVE_USBHID_H
- d = hid_start_parse( rd, 1 << hid_input, report_id );
-# else
- d = hid_start_parse( rd, 1 << hid_input );
-# endif
- while( hid_get_item( d, &h ) )
- {
- int usage, page, interesting_hid;
-
- page = HID_PAGE( h.usage );
- usage = HID_USAGE( h.usage );
-
- /* This test is somewhat too simplistic, but this is how MicroSoft
- * does, so I guess it works for all joysticks/game pads. */
- is_joystick = is_joystick ||
- ( h.kind == hid_collection &&
- page == HUP_GENERIC_DESKTOP &&
- ( usage == HUG_JOYSTICK || usage == HUG_GAME_PAD ) );
-
- if( h.kind != hid_input )
- continue;
-
- if( !is_joystick )
- continue;
-
- interesting_hid = TRUE;
- if( page == HUP_GENERIC_DESKTOP )
- {
- switch( usage )
- {
- case HUG_X:
- case HUG_RX:
- case HUG_Y:
- case HUG_RY:
- case HUG_Z:
- case HUG_RZ:
- case HUG_SLIDER:
- if( *num_axes < _JS_MAX_AXES )
- {
- os->axes_usage *num_axes = usage;
- ( *num_axes )++;
- }
- break;
- case HUG_HAT_SWITCH:

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_main.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_main.c Changed

@@ -154,7 +154,7 @@
 SFG_Enumerator *enumerator )
 {
 if( window->State.WorkMask )
-		fgProcessWork ( window );
+ fgProcessWork ( window );
 
 fgEnumSubWindows( window, fghcbProcessWork, enumerator );
 }
@@ -179,7 +179,7 @@
 SFG_Enumerator *enumerator )
 {
 fg_time_t checkTime;
- 
+
 if (window->State.JoystickPollRate > 0 && FETCH_WCB( *window, Joystick ))
 {
 /* This window has a joystick to be polled (if pollrate <= 0, user needs to poll manually with glutForceJoystickFunc */
@@ -200,7 +200,7 @@
 
 /*
 * Check all windows for joystick polling
- * 
+ *
 * The real way to do this is to make use of the glutTimer() API
 * to more cleanly re-implement the joystick API. Then, this code
 * and all other "joystick timer" code can be yanked.
@@ -233,22 +233,22 @@
 fgListRemove( &fgState.Timers, &timer->Node );
 fgListAppend( &fgState.FreeTimers, &timer->Node );
 
- timer->Callback( timer->ID );
+ timer->Callback( timer->ID, timer->CallbackData );
 }
 }
 
- 
+
 /* Platform-dependent time in milliseconds, as an unsigned 64-bit integer.
 * This doesn't overflow in any reasonable time, so no need to worry about
 * that. The GLUT API return value will however overflow after 49.7 days,
 * which means you will still get in trouble when running the
 * application for more than 49.7 days.
- */ 
+ */
 fg_time_t fgSystemTime(void)
 {
-	return fgPlatformSystemTime();
+ return fgPlatformSystemTime();
 }
- 
+
 /*
 * Elapsed Time
 */
@@ -269,7 +269,7 @@
 va_start( ap, fmt );
 
 /* call user set error handler here */
- fgState.ErrorFunc(fmt, ap);
+ fgState.ErrorFunc(fmt, ap, fgState.ErrorFuncData);
 
 va_end( ap );
 
@@ -302,7 +302,7 @@
 va_start( ap, fmt );
 
 /* call user set warning handler here */
- fgState.WarningFunc(fmt, ap);
+ fgState.WarningFunc(fmt, ap, fgState.WarningFuncData);
 
 va_end( ap );
 
@@ -376,10 +376,10 @@
 msec = fghNextTimer( );
 /* XXX Should use GLUT timers for joysticks... */
 /* XXX Dumb; forces granularity to .01sec */
- if( fgState.NumActiveJoysticks>0 && ( msec > 10 ) ) 
+ if( fgState.NumActiveJoysticks>0 && ( msec > 10 ) )
 msec = 10;
 
-	fgPlatformSleepForEvents ( msec );
+ fgPlatformSleepForEvents ( msec );
 }
 
 
@@ -400,7 +400,7 @@
 fgPlatformInitWork(window);
 
 /* Call init context callback */
- INVOKE_WCB( *window, InitContext, ());
+ INVOKE_WCB( *window, InitContext, ( ) );
 
 /* Lastly, check if we have a display callback, error out if not
 * This is the right place to do it, as the redisplay will be
@@ -446,7 +446,7 @@
 void FGAPIENTRY glutMainLoopEvent( void )
 {
 /* Process input */
-	fgPlatformProcessSingleEvent ();
+ fgPlatformProcessSingleEvent ();
 
 if( fgState.Timers.First )
 fghCheckTimers( );
@@ -479,14 +479,16 @@
 if (!fgStructure.Windows.First)
 fgError(" ERROR: glutMainLoop called with no windows created.");
 
-	fgPlatformMainLoopPreliminaryWork ();
+ fgPlatformMainLoopPreliminaryWork ();
 
 fgState.ExecState = GLUT_EXEC_STATE_RUNNING ;
- while( fgState.ExecState == GLUT_EXEC_STATE_RUNNING )
+ for(;;)
 {
 SFG_Window *window;
 
 glutMainLoopEvent( );
+ if( fgState.ExecState != GLUT_EXEC_STATE_RUNNING )
+ break;
 /*
 * Step through the list of windows, seeing if there are any
 * that are not menus
@@ -507,7 +509,7 @@
 fgStructure.CurrentWindow->IsMenu )
 /* fail safe */
 fgSetWindow( window );
- fgState.IdleCallback( );
+ fgState.IdleCallback( fgState.IdleCallbackData );
 }
 else
 fghSleepForEvents( );

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_menu.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_menu.c Changed

@@ -135,7 +135,7 @@
 static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
 {
     if( fgStructure.GameModeWindow )
-		fgPlatformGetGameModeVMaxExtent ( window, x, y );
+        fgPlatformGetGameModeVMaxExtent ( window, x, y );
     else
     {
         *x = fgDisplay.ScreenWidth;
@@ -531,7 +531,7 @@
             fgState.MenuStateCallback(GLUT_MENU_IN_USE);
         if (fgState.MenuStatusCallback)
             /* window->State.MouseX and window->State.MouseY are relative to client area origin, as needed */
-            fgState.MenuStatusCallback(GLUT_MENU_IN_USE, window->State.MouseX, window->State.MouseY);
+            fgState.MenuStatusCallback(GLUT_MENU_IN_USE, window->State.MouseX, window->State.MouseY, fgState.MenuStatusCallbackData);
     }
 
     fgSetWindow( menu->Window );
@@ -609,7 +609,7 @@
 
                 /* Deactivate menu and then call callback (we don't want menu to stay in view while callback is executing, and user should be able to change menus in callback) */
                 fgDeactivateMenu( parent_window );
-                active_menu->Callback( active_entry->ID );
+                active_menu->Callback( active_entry->ID, active_menu->CallbackData );
 
                 /* Restore the current window and menu */
                 fgSetWindow( save_window );
@@ -725,7 +725,7 @@
             SFG_XYUse mouse_pos;
             fghPlatformGetCursorPos(parent_window, GL_TRUE, &mouse_pos);
 
-            fgState.MenuStatusCallback(GLUT_MENU_NOT_IN_USE, mouse_pos.X, mouse_pos.Y);
+            fgState.MenuStatusCallback(GLUT_MENU_NOT_IN_USE, mouse_pos.X, mouse_pos.Y, fgState.MenuStatusCallbackData);
         }
     }
 }
@@ -780,14 +780,35 @@
 /*
  * Creates a new menu object, adding it to the freeglut structure
  */
-int FGAPIENTRY glutCreateMenu( FGCBMenu callback )
+int FGAPIENTRY glutCreateMenuUcall( FGCBMenuUC callback, FGCBUserData userData )
 {
     /* The menu object creation code resides in fg_structure.c */
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenuUcall" );
     if (fgState.ActiveMenus)
-        fgError("Menu manipulation not allowed while menus in use.");
+    {
+        fgError( "Menu manipulation not allowed while menus in use." );
+    }
+
+    return fgCreateMenu( callback, userData )->ID;
+}
 
-    return fgCreateMenu( callback )->ID;
+/* Standard glutCreateMenu */
+static void fghCreateMenuCallback( int menu, FGCBUserData userData )
+{
+    FGCBMenu* callback = (FGCBMenu*)&userData;
+    (*callback)( menu );
+}
+
+int FGAPIENTRY glutCreateMenu( FGCBMenu callback )
+{
+    FGCBMenu* reference;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
+    if (!callback)
+    {
+        return glutCreateMenuUcall( NULL, NULL );
+    }
+    reference = &callback;
+    return glutCreateMenuUcall( fghCreateMenuCallback, *((FGCBUserData*)reference) );
 }
 
 /*

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_misc.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_misc.c Changed

@@ -28,14 +28,12 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
-/*
- * TODO BEFORE THE STABLE RELEASE:
- *
- * glutSetColor() --
- * glutGetColor() --
- * glutCopyColormap() --
- * glutSetKeyRepeat() -- this is evil and should be removed from API
- */
+
+/* platform-specific colormap functions */
+void fgPlatformSetColor(int idx, float r, float g, float b);
+float fgPlatformGetColor(int idx, int comp);
+void fgPlatformCopyColormap(int win);
+
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
@@ -175,29 +173,28 @@
 /*
 *
 */
-void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat blue )
+void FGAPIENTRY glutSetColor(int idx, GLfloat r, GLfloat g, GLfloat b)
 {
- FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetColor" );
- /* We really need to do something here. */
+	FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetColor" );
+	fgPlatformSetColor(idx, r, g, b);
 }
 
 /*
 *
 */
-GLfloat FGAPIENTRY glutGetColor( int color, int component )
+GLfloat FGAPIENTRY glutGetColor(int idx, int component)
 {
- FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetColor" );
- /* We really need to do something here. */
- return( 0.0f );
+	FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetColor" );
+	return fgPlatformGetColor(idx, component);
 }
 
 /*
 *
 */
-void FGAPIENTRY glutCopyColormap( int window )
+void FGAPIENTRY glutCopyColormap(int window)
 {
- FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCopyColormap" );
- /* We really need to do something here. */
+	FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCopyColormap" );
+	fgPlatformCopyColormap(window);
 }
 
 /*** END OF FILE ***/

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_spaceball.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_spaceball.c Changed

@@ -7,9 +7,12 @@
 * magellan X-based protocol.
 */
 
+
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
+#if( !_WIN32 || _WIN32_WINNT >= 0x0501)
+
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 
 extern void fgPlatformInitializeSpaceball(void);
@@ -19,28 +22,27 @@
 extern void fgPlatformSpaceballSetWindow(SFG_Window *window);
 
 
-int sball_initialized = 0;
+int fg_sball_initialized = 0;
 
 void fgInitialiseSpaceball(void)
 {
- if(sball_initialized != 0) {
+ if(fg_sball_initialized != 0) {
 return;
 }
 
 fgPlatformInitializeSpaceball();
-
- sball_initialized = 1;
 }
 
 void fgSpaceballClose(void)
 {
-	fgPlatformSpaceballClose();}
+ fgPlatformSpaceballClose();
+}
 
 int fgHasSpaceball(void)
 {
- if(sball_initialized == 0) {
+ if(fg_sball_initialized == 0) {
 fgInitialiseSpaceball();
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
 fgWarning("fgInitialiseSpaceball failed\n");
 return 0;
 }
@@ -51,9 +53,9 @@
 
 int fgSpaceballNumButtons(void)
 {
- if(sball_initialized == 0) {
+ if(fg_sball_initialized == 0) {
 fgInitialiseSpaceball();
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
 fgWarning("fgInitialiseSpaceball failed\n");
 return 0;
 }
@@ -64,9 +66,9 @@
 
 void fgSpaceballSetWindow(SFG_Window *window)
 {
- if(sball_initialized == 0) {
+ if(fg_sball_initialized == 0) {
 fgInitialiseSpaceball();
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
 return;
 }
 }
@@ -74,3 +76,28 @@
 fgPlatformSpaceballSetWindow(window);
 }
 
+#else
+
+void fgInitialiseSpaceball(void)
+{
+}
+
+void fgSpaceballClose(void)
+{
+}
+
+int fgHasSpaceball(void)
+{
+ return 0;
+}
+
+int fgSpaceballNumButtons(void)
+{
+ return 0;
+}
+
+void fgSpaceballSetWindow(SFG_Window *window)
+{
+}
+
+#endif

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_state.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_state.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_stroke_mono_roman.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_stroke_mono_roman.c Changed

@@ -33,22 +33,22 @@
 
 /* char: 0x20 */
 
-static const SFG_StrokeStrip ch32st =
+static const SFG_StrokeStrip StrokeMonoRoman_ch32st =
 {
   { 0, NULL }
 };
 
-static const SFG_StrokeChar ch32 = {104.762f,0,ch32st};
+static const SFG_StrokeChar StrokeMonoRoman_ch32 = {104.762f,0,StrokeMonoRoman_ch32st};
 
 /* char: 0x21 */
 
-static const SFG_StrokeVertex ch33st0 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch33st0 =
 {
  {52.381f,100.0f},
  {52.381f,33.3333f}
 };
 
-static const SFG_StrokeVertex ch33st1 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch33st1 =
 {
  {52.381f,9.5238f},
  {47.6191f,4.7619f},
@@ -57,87 +57,87 @@
  {52.381f,9.5238f}
 };
 
-static const SFG_StrokeStrip ch33st =
+static const SFG_StrokeStrip StrokeMonoRoman_ch33st =
 {
- {2,ch33st0},
- {5,ch33st1}
+ {2,StrokeMonoRoman_ch33st0},
+ {5,StrokeMonoRoman_ch33st1}
 };
 
-static const SFG_StrokeChar ch33 = {104.762f,2,ch33st};
+static const SFG_StrokeChar StrokeMonoRoman_ch33 = {104.762f,2,StrokeMonoRoman_ch33st};
 
 /* char: 0x22 */
 
-static const SFG_StrokeVertex ch34st0 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch34st0 =
 {
  {33.3334f,100.0f},
  {33.3334f,66.6667f}
 };
 
-static const SFG_StrokeVertex ch34st1 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch34st1 =
 {
  {71.4286f,100.0f},
  {71.4286f,66.6667f}
 };
 
-static const SFG_StrokeStrip ch34st =
+static const SFG_StrokeStrip StrokeMonoRoman_ch34st =
 {
- {2,ch34st0},
- {2,ch34st1}
+ {2,StrokeMonoRoman_ch34st0},
+ {2,StrokeMonoRoman_ch34st1}
 };
 
-static const SFG_StrokeChar ch34 = {104.762f,2,ch34st};
+static const SFG_StrokeChar StrokeMonoRoman_ch34 = {104.762f,2,StrokeMonoRoman_ch34st};
 
 /* char: 0x23 */
 
-static const SFG_StrokeVertex ch35st0 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch35st0 =
 {
  {54.7619f,119.048f},
  {21.4286f,-33.3333f}
 };
 
-static const SFG_StrokeVertex ch35st1 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch35st1 =
 {
  {83.3334f,119.048f},
  {50.0f,-33.3333f}
 };
 
-static const SFG_StrokeVertex ch35st2 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch35st2 =
 {
  {21.4286f,57.1429f},
  {88.0952f,57.1429f}
 };
 
-static const SFG_StrokeVertex ch35st3 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch35st3 =
 {
  {16.6667f,28.5714f},
  {83.3334f,28.5714f}
 };
 
-static const SFG_StrokeStrip ch35st =
+static const SFG_StrokeStrip StrokeMonoRoman_ch35st =
 {
- {2,ch35st0},
- {2,ch35st1},
- {2,ch35st2},
- {2,ch35st3}
+ {2,StrokeMonoRoman_ch35st0},
+ {2,StrokeMonoRoman_ch35st1},
+ {2,StrokeMonoRoman_ch35st2},
+ {2,StrokeMonoRoman_ch35st3}
 };
 
-static const SFG_StrokeChar ch35 = {104.762f,4,ch35st};
+static const SFG_StrokeChar StrokeMonoRoman_ch35 = {104.762f,4,StrokeMonoRoman_ch35st};
 
 /* char: 0x24 */
 
-static const SFG_StrokeVertex ch36st0 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch36st0 =
 {
  {42.8571f,119.048f},
  {42.8571f,-19.0476f}
 };
 
-static const SFG_StrokeVertex ch36st1 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch36st1 =
 {
  {61.9047f,119.048f},
  {61.9047f,-19.0476f}
 };
 
-static const SFG_StrokeVertex ch36st2 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch36st2 =
 {
  {85.7143f,85.7143f},
  {76.1905f,95.2381f},
@@ -161,24 +161,24 @@
  {19.0476f,14.2857f}
 };
 
-static const SFG_StrokeStrip ch36st =
+static const SFG_StrokeStrip StrokeMonoRoman_ch36st =
 {
- {2,ch36st0},
- {2,ch36st1},
- {20,ch36st2}
+ {2,StrokeMonoRoman_ch36st0},
+ {2,StrokeMonoRoman_ch36st1},
+ {20,StrokeMonoRoman_ch36st2}
 };
 
-static const SFG_StrokeChar ch36 = {104.762f,3,ch36st};
+static const SFG_StrokeChar StrokeMonoRoman_ch36 = {104.762f,3,StrokeMonoRoman_ch36st};
 
 /* char: 0x25 */
 
-static const SFG_StrokeVertex ch37st0 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch37st0 =
 {
  {95.2381f,100.0f},
  {9.5238f,0.0f}
 };
 
-static const SFG_StrokeVertex ch37st1 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch37st1 =
 {
  {33.3333f,100.0f},
  {42.8571f,90.4762f},
@@ -198,7 +198,7 @@
  {95.2381f,100.0f}
 };
 
-static const SFG_StrokeVertex ch37st2 =
+static const SFG_StrokeVertex StrokeMonoRoman_ch37st2 =
 {
  {76.1905f,33.3333f},
  {66.6667f,28.5714f},
@@ -213,18 +213,18 @@
  {76.1905f,33.3333f}
 };
 
-static const SFG_StrokeStrip ch37st =
+static const SFG_StrokeStrip StrokeMonoRoman_ch37st =
 {
- {2,ch37st0},
- {16,ch37st1},
- {11,ch37st2}
+ {2,StrokeMonoRoman_ch37st0},
+ {16,StrokeMonoRoman_ch37st1},
+ {11,StrokeMonoRoman_ch37st2}
 };
 
-static const SFG_StrokeChar ch37 = {104.762f,3,ch37st};
+static const SFG_StrokeChar StrokeMonoRoman_ch37 = {104.762f,3,StrokeMonoRoman_ch37st};
 
 /* char: 0x26 */
 
-static const SFG_StrokeVertex ch38st0 =

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_stroke_roman.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_stroke_roman.c Changed

@@ -33,22 +33,22 @@
 
 /* char: 0x20 */
 
-static const SFG_StrokeStrip ch32st =
+static const SFG_StrokeStrip StrokeRoman_ch32st =
 {
   { 0, NULL }
 };
 
-static const SFG_StrokeChar ch32 = {104.762f,0,ch32st};
+static const SFG_StrokeChar StrokeRoman_ch32 = {104.762f,0,StrokeRoman_ch32st};
 
 /* char: 0x21 */
 
-static const SFG_StrokeVertex ch33st0 =
+static const SFG_StrokeVertex StrokeRoman_ch33st0 =
 {
  {13.3819f,100.0f},
  {13.3819f,33.3333f}
 };
 
-static const SFG_StrokeVertex ch33st1 =
+static const SFG_StrokeVertex StrokeRoman_ch33st1 =
 {
  {13.3819f,9.5238f},
  {8.62f,4.7619f},
@@ -57,87 +57,87 @@
  {13.3819f,9.5238f}
 };
 
-static const SFG_StrokeStrip ch33st =
+static const SFG_StrokeStrip StrokeRoman_ch33st =
 {
- {2,ch33st0},
- {5,ch33st1}
+ {2,StrokeRoman_ch33st0},
+ {5,StrokeRoman_ch33st1}
 };
 
-static const SFG_StrokeChar ch33 = {26.6238f,2,ch33st};
+static const SFG_StrokeChar StrokeRoman_ch33 = {26.6238f,2,StrokeRoman_ch33st};
 
 /* char: 0x22 */
 
-static const SFG_StrokeVertex ch34st0 =
+static const SFG_StrokeVertex StrokeRoman_ch34st0 =
 {
  {4.02f,100.0f},
  {4.02f,66.6667f}
 };
 
-static const SFG_StrokeVertex ch34st1 =
+static const SFG_StrokeVertex StrokeRoman_ch34st1 =
 {
  {42.1152f,100.0f},
  {42.1152f,66.6667f}
 };
 
-static const SFG_StrokeStrip ch34st =
+static const SFG_StrokeStrip StrokeRoman_ch34st =
 {
- {2,ch34st0},
- {2,ch34st1}
+ {2,StrokeRoman_ch34st0},
+ {2,StrokeRoman_ch34st1}
 };
 
-static const SFG_StrokeChar ch34 = {51.4352f,2,ch34st};
+static const SFG_StrokeChar StrokeRoman_ch34 = {51.4352f,2,StrokeRoman_ch34st};
 
 /* char: 0x23 */
 
-static const SFG_StrokeVertex ch35st0 =
+static const SFG_StrokeVertex StrokeRoman_ch35st0 =
 {
  {41.2952f,119.048f},
  {7.9619f,-33.3333f}
 };
 
-static const SFG_StrokeVertex ch35st1 =
+static const SFG_StrokeVertex StrokeRoman_ch35st1 =
 {
  {69.8667f,119.048f},
  {36.5333f,-33.3333f}
 };
 
-static const SFG_StrokeVertex ch35st2 =
+static const SFG_StrokeVertex StrokeRoman_ch35st2 =
 {
  {7.9619f,57.1429f},
  {74.6286f,57.1429f}
 };
 
-static const SFG_StrokeVertex ch35st3 =
+static const SFG_StrokeVertex StrokeRoman_ch35st3 =
 {
  {3.2f,28.5714f},
  {69.8667f,28.5714f}
 };
 
-static const SFG_StrokeStrip ch35st =
+static const SFG_StrokeStrip StrokeRoman_ch35st =
 {
- {2,ch35st0},
- {2,ch35st1},
- {2,ch35st2},
- {2,ch35st3}
+ {2,StrokeRoman_ch35st0},
+ {2,StrokeRoman_ch35st1},
+ {2,StrokeRoman_ch35st2},
+ {2,StrokeRoman_ch35st3}
 };
 
-static const SFG_StrokeChar ch35 = {79.4886f,4,ch35st};
+static const SFG_StrokeChar StrokeRoman_ch35 = {79.4886f,4,StrokeRoman_ch35st};
 
 /* char: 0x24 */
 
-static const SFG_StrokeVertex ch36st0 =
+static const SFG_StrokeVertex StrokeRoman_ch36st0 =
 {
  {28.6295f,119.048f},
  {28.6295f,-19.0476f}
 };
 
-static const SFG_StrokeVertex ch36st1 =
+static const SFG_StrokeVertex StrokeRoman_ch36st1 =
 {
  {47.6771f,119.048f},
  {47.6771f,-19.0476f}
 };
 
-static const SFG_StrokeVertex ch36st2 =
+static const SFG_StrokeVertex StrokeRoman_ch36st2 =
 {
  {71.4867f,85.7143f},
  {61.9629f,95.2381f},
@@ -161,24 +161,24 @@
  {4.82f,14.2857f}
 };
 
-static const SFG_StrokeStrip ch36st =
+static const SFG_StrokeStrip StrokeRoman_ch36st =
 {
- {2,ch36st0},
- {2,ch36st1},
- {20,ch36st2}
+ {2,StrokeRoman_ch36st0},
+ {2,StrokeRoman_ch36st1},
+ {20,StrokeRoman_ch36st2}
 };
 
-static const SFG_StrokeChar ch36 = {76.2067f,3,ch36st};
+static const SFG_StrokeChar StrokeRoman_ch36 = {76.2067f,3,StrokeRoman_ch36st};
 
 /* char: 0x25 */
 
-static const SFG_StrokeVertex ch37st0 =
+static const SFG_StrokeVertex StrokeRoman_ch37st0 =
 {
  {92.0743f,100.0f},
  {6.36f,0.0f}
 };
 
-static const SFG_StrokeVertex ch37st1 =
+static const SFG_StrokeVertex StrokeRoman_ch37st1 =
 {
  {30.1695f,100.0f},
  {39.6933f,90.4762f},
@@ -198,7 +198,7 @@
  {92.0743f,100.0f}
 };
 
-static const SFG_StrokeVertex ch37st2 =
+static const SFG_StrokeVertex StrokeRoman_ch37st2 =
 {
  {73.0267f,33.3333f},
  {63.5029f,28.5714f},
@@ -213,18 +213,18 @@
  {73.0267f,33.3333f}
 };
 
-static const SFG_StrokeStrip ch37st =
+static const SFG_StrokeStrip StrokeRoman_ch37st =
 {
- {2,ch37st0},
- {16,ch37st1},
- {11,ch37st2}
+ {2,StrokeRoman_ch37st0},
+ {16,StrokeRoman_ch37st1},
+ {11,StrokeRoman_ch37st2}
 };
 
-static const SFG_StrokeChar ch37 = {96.5743f,3,ch37st};
+static const SFG_StrokeChar StrokeRoman_ch37 = {96.5743f,3,StrokeRoman_ch37st};
 
 /* char: 0x26 */
 
-static const SFG_StrokeVertex ch38st0 =

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_structure.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_structure.c Changed

@@ -49,7 +49,7 @@
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
 extern void fgPlatformCreateWindow ( SFG_Window *window );
-extern void fghDefaultReshape(int width, int height);
+extern void fghDefaultReshape(int width, int height, FGCBUserData userData);
 
 static void fghClearCallBacks( SFG_Window *window )
 {
@@ -57,7 +57,10 @@
 {
 int i;
 for( i = 0; i < TOTAL_CALLBACKS; ++i )
+ {
 window->CallBacks i = NULL;
+ window->CallbackDatas i = NULL;
+ }
 }
 }
 
@@ -75,10 +78,15 @@
 /* Have the window object created */
 SFG_Window *window = (SFG_Window *)calloc( 1, sizeof(SFG_Window) );
 
-	fgPlatformCreateWindow ( window );
+ if( !window )
+ {
+ fgError( "Out of memory. Could not create window." );
+ }
+
+ fgPlatformCreateWindow ( window );
 
 fghClearCallBacks( window );
- SET_WCB( *window, Reshape, fghDefaultReshape);
+ SET_WCB( *window, Reshape, fghDefaultReshape, NULL);
 
 /* Initialize the object properties */
 window->ID = ++fgStructure.WindowID;
@@ -111,7 +119,7 @@
 /*
 * This private function creates a menu and adds it to the menus list
 */
-SFG_Menu* fgCreateMenu( FGCBMenu menuCallback )
+SFG_Menu* fgCreateMenu( FGCBMenuUC menuCallback, FGCBUserData userData )
 {
 SFG_Window *current_window = fgStructure.CurrentWindow;
 
@@ -129,10 +137,11 @@
 fgSetWindow( current_window );
 
 /* Initialize the object properties: */
- menu->ID = ++fgStructure.MenuID;
- menu->Callback = menuCallback;
- menu->ActiveEntry = NULL;
- menu->Font = fgState.MenuFont;
+ menu->ID = ++fgStructure.MenuID;
+ menu->Callback = menuCallback;
+ menu->CallbackData = userData;
+ menu->ActiveEntry = NULL;
+ menu->Font = fgState.MenuFont;
 
 fgListInit( &menu->Entries );
 fgListAppend( &fgStructure.Menus, &menu->Node );
@@ -168,10 +177,16 @@
 * to ensure that they are no longer called after this point.
 */
 {
- FGCBDestroy destroy = (FGCBDestroy)FETCH_WCB( *window, Destroy );
+ FGCBDestroyUC destroy = (FGCBDestroyUC)FETCH_WCB( *window, Destroy );
+ FGCBUserData destroyData = FETCH_USER_DATA_WCB( *window, Destroy );
 fghClearCallBacks( window );
- SET_WCB( *window, Destroy, destroy );
+ SET_WCB( *window, Destroy, destroy, destroyData );
 }
+
+ /*
+ * Similarly, clear all work set for the window, none of this has to be executed anymore
+ */
+ window->State.WorkMask = 0;
 }
 
 /*
@@ -297,7 +312,7 @@
 {
 SFG_Menu *activeMenu=fgStructure.CurrentMenu;
 fgStructure.CurrentMenu = menu;
- menu->Destroy( );
+ menu->Destroy( menu->DestroyData );
 fgStructure.CurrentMenu = activeMenu;
 }

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_version.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_version.h Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/fg_window.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/fg_window.c Changed

@@ -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 )
@@ -177,12 +183,12 @@
 * XXX application has not already done so. The "freeglut" community
 * XXX decided not to go this route (freeglut-developer e-mail from
 * XXX Steve Baker, 12/16/04, 4:22 PM CST, "Re: Freeglut-developer
- * XXX Desired 'freeglut' behaviour when there is no current window"
+ * XXX Desired 'freeglut' behaviour when there is no current window")
 */
 FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateWindow" );
 
- return fgCreateWindow( NULL, title, fgState.Position.Use,
- fgState.Position.X, fgState.Position.Y,
+ return fgCreateWindow( NULL, title, 
+ fgState.Position.Use, fgState.Position.X, fgState.Position.Y,
 fgState.Size.Use, fgState.Size.X, fgState.Size.Y,
 GL_FALSE, GL_FALSE )->ID;
 }
@@ -199,33 +205,51 @@
 FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateSubWindow" );
 parent = fgWindowByID( parentID );
 freeglut_return_val_if_fail( parent != NULL, 0 );
- if ( x < 0 )
- {
- x = parent->State.Width + x ;
- if ( w >= 0 ) x -= w ;
- }
 
- if ( w < 0 ) w = parent->State.Width - x + w ;
- if ( w < 0 )
+ if ( fgState.AllowNegativeWindowPosition )
 {
- x += w ;
- w = -w ;
- }
+ /* XXX This results in different widths/heights than if AllowNegativeWindowPosition
+ * XXX was false. The "freeglut" community defined this logic.
+ * XXX (freeglut-developer e-mail from Diederick C. Niehorster, 11/15/2015, 4:06 PM EST.
+ * XXX "Re: Freeglut-developer glutInitWindowPosition with negative coordinate(s)")
+ */
 
- if ( y < 0 )
- {
- y = parent->State.Height + y ;
- if ( h >= 0 ) y -= h ;
+ if ( w < 0 ) w = parent->State.Width + w ;
+ if ( h < 0 ) h = parent->State.Height + h ;
 }
-
- if ( h < 0 ) h = parent->State.Height - y + h ;
- if ( h < 0 )
+ else
 {
- y += h ;
- h = -h ;
+ if ( ( x < 0 ) )
+ {
+ x = parent->State.Width + x ;
+ if ( w > 0 ) x -= w ;
+ }
+
+ if ( w < 0 ) w = parent->State.Width - x + w ;
+ if ( w < 0 )
+ {
+ x += w ;
+ w = -w ;
+ }
+
+ if ( ( y < 0 ) )
+ {
+ y = parent->State.Height + y ;
+ if ( h > 0 ) y -= h ;
+ }
+
+ if ( h < 0 ) h = parent->State.Height - y + h ;
+ if ( h < 0 )
+ {
+ y += h ;
+ h = -h ;
+ }
 }
 
- window = fgCreateWindow( parent, "", GL_TRUE, x, y, GL_TRUE, w, h, GL_FALSE, GL_FALSE );
+ window = fgCreateWindow( parent, "", 
+ GL_TRUE, x, y, 
+ GL_TRUE, w, h, 
+ GL_FALSE, GL_FALSE );
 ret = window->ID;
 
 return ret;

_service:tar_scm:freeglut-3.0.0.tar.gz/src/freeglutdll.def.in -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/freeglutdll.def.in Changed

@@ -1,163 +1,163 @@
 VERSION @VERSION_MAJOR@.@VERSION_MINOR@
 EXPORTS
-	glutInit
-	glutInitWindowPosition
-	glutInitWindowSize
-	glutInitDisplayMode
-	glutInitDisplayString
-	glutMainLoop
-	glutMainLoopEvent
-	glutLeaveMainLoop
-	glutCreateWindow
-	glutCreateSubWindow
-	glutDestroyWindow
-	glutSetWindow
-	glutGetWindow
-	glutSetWindowData
-	glutGetWindowData
-	glutSetWindowTitle
-	glutSetIconTitle
-	glutReshapeWindow
-	glutPositionWindow
-	glutShowWindow
-	glutHideWindow
-	glutIconifyWindow
-	glutPushWindow
-	glutPopWindow
-	glutFullScreen
-	glutPostWindowRedisplay
-	glutPostRedisplay
-	glutSwapBuffers
-	glutWarpPointer
-	glutSetCursor
-	glutEstablishOverlay
-	glutRemoveOverlay
-	glutUseLayer
-	glutPostOverlayRedisplay
-	glutPostWindowOverlayRedisplay
-	glutShowOverlay
-	glutHideOverlay
-	glutCreateMenu
-	glutDestroyMenu
-	glutGetMenu
-	glutSetMenu
-	glutGetMenuData
-	glutSetMenuData
-	glutAddMenuEntry
-	glutAddSubMenu
-	glutChangeToMenuEntry
-	glutChangeToSubMenu
-	glutRemoveMenuItem
-	glutAttachMenu
-	glutDetachMenu
-	glutTimerFunc
-	glutIdleFunc
-	glutKeyboardFunc
-	glutSpecialFunc
-	glutReshapeFunc
+    glutInit
+    glutInitWindowPosition
+    glutInitWindowSize
+    glutInitDisplayMode
+    glutInitDisplayString
+    glutMainLoop
+    glutMainLoopEvent
+    glutLeaveMainLoop
+    glutCreateWindow
+    glutCreateSubWindow
+    glutDestroyWindow
+    glutSetWindow
+    glutGetWindow
+    glutSetWindowData
+    glutGetWindowData
+    glutSetWindowTitle
+    glutSetIconTitle
+    glutReshapeWindow
+    glutPositionWindow
+    glutShowWindow
+    glutHideWindow
+    glutIconifyWindow
+    glutPushWindow
+    glutPopWindow
+    glutFullScreen
+    glutPostWindowRedisplay
+    glutPostRedisplay
+    glutSwapBuffers
+    glutWarpPointer
+    glutSetCursor
+    glutEstablishOverlay
+    glutRemoveOverlay
+    glutUseLayer
+    glutPostOverlayRedisplay
+    glutPostWindowOverlayRedisplay
+    glutShowOverlay
+    glutHideOverlay
+    glutCreateMenu
+    glutDestroyMenu
+    glutGetMenu
+    glutSetMenu
+    glutGetMenuData
+    glutSetMenuData
+    glutAddMenuEntry
+    glutAddSubMenu
+    glutChangeToMenuEntry
+    glutChangeToSubMenu
+    glutRemoveMenuItem
+    glutAttachMenu
+    glutDetachMenu
+    glutTimerFunc
+    glutIdleFunc
+    glutKeyboardFunc
+    glutSpecialFunc
+    glutReshapeFunc
     glutPositionFunc
-	glutVisibilityFunc
-	glutDisplayFunc
-	glutMouseFunc
-	glutMouseWheelFunc
-	glutMotionFunc
-	glutPassiveMotionFunc
-	glutEntryFunc
-	glutCloseFunc
-	glutWMCloseFunc
-	glutKeyboardUpFunc
-	glutSpecialUpFunc
-	glutJoystickFunc
-	glutMenuStateFunc
-	glutMenuStatusFunc
-	glutMenuDestroyFunc
-	glutOverlayDisplayFunc
-	glutWindowStatusFunc
-	glutSpaceballMotionFunc
-	glutSpaceballRotateFunc
-	glutSpaceballButtonFunc
-	glutButtonBoxFunc
-	glutDialsFunc
-	glutTabletMotionFunc
-	glutTabletButtonFunc
-	glutSetOption
-	glutGet
-	glutDeviceGet
-	glutGetModifiers
-	glutLayerGet
-	glutBitmapCharacter
-	glutBitmapWidth
-	glutStrokeCharacter
-	glutStrokeWidth
-	glutBitmapLength
-	glutStrokeLength
-	glutBitmapHeight
-	glutStrokeHeight
-	glutBitmapString
-	glutStrokeString
-	glutWireCube
-	glutSolidCube
-	glutWireSphere
-	glutSolidSphere
-	glutWireCone
-	glutSolidCone
-	glutWireTorus
-	glutSolidTorus
-	glutWireDodecahedron
-	glutSolidDodecahedron
-	glutWireOctahedron
-	glutSolidOctahedron
-	glutWireTetrahedron
-	glutSolidTetrahedron
-	glutWireIcosahedron
-	glutSolidIcosahedron
-	glutWireRhombicDodecahedron
-	glutSolidRhombicDodecahedron
-	glutWireSierpinskiSponge
-	glutSolidSierpinskiSponge
-	glutWireTeapot
-	glutSolidTeapot
-	glutWireTeacup
-	glutSolidTeacup
-	glutWireTeaspoon
-	glutSolidTeaspoon
-	glutWireCylinder
-	glutSolidCylinder
-	glutGameModeString
-	glutEnterGameMode
-	glutLeaveGameMode
-	glutGameModeGet
-	glutVideoResizeGet
-	glutSetupVideoResizing
-	glutStopVideoResizing
-	glutVideoResize
-	glutVideoPan
-	glutSetColor
-	glutGetColor
-	glutCopyColormap
-	glutIgnoreKeyRepeat
-	glutSetKeyRepeat
-	glutForceJoystickFunc
-	glutExtensionSupported
-	glutReportErrors
-	glutGetProcAddress
-	glutExit

_service:tar_scm:freeglut-3.0.0.tar.gz/src/gles_stubs.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/gles_stubs.c Changed

_service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_cmap_mswin.c Added

@@ -0,0 +1,86 @@
+/* fg_cmap_mswin.c
+ *
+ * Win32 implementation of the colormap functions
+ *
+ * Copyright (C) 2022 John Tsiombikas <nuclear@member.fsf.org>
+ * Creation date: Sat September 3 2022
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include <GL/freeglut.h>
+#include "../fg_internal.h"
+
+void fgPlatformSetColor(int idx, float r, float g, float b)
+{
+	HPALETTE pal;
+	PALETTEENTRY col;
+	HDC dc;
+
+	if(idx < 0 || idx >= 256) {
+		return;
+	}
+
+	col.peRed = (int)(r * 255.0f);
+	col.peGreen = (int)(g * 255.0f);
+	col.peBlue = (int)(b * 255.0f);
+	col.peFlags = PC_NOCOLLAPSE;
+
+	pal = fgStructure.CurrentWindow->Window.cmap;
+	SetPaletteEntries(pal, idx, 1, &col);
+
+	if(!(dc = fgStructure.CurrentWindow->Window.pContext.Device)) {
+		return;
+	}
+
+	UnrealizeObject(pal);
+	SelectPalette(dc, pal, 0);
+	RealizePalette(dc);
+}
+
+float fgPlatformGetColor(int idx, int comp)
+{
+	PALETTEENTRY col;
+	HPALETTE pal;
+
+	if(idx < 0 || idx >= 256) {
+		return -1.0f;
+	}
+
+	pal = fgStructure.CurrentWindow->Window.cmap;
+	if(!GetPaletteEntries(pal, idx, 1, &col)) {
+		return -1.0f;
+	}
+
+	switch(comp) {
+	case GLUT_RED:
+		return col.peRed / 255.0f;
+	case GLUT_GREEN:
+		return col.peGreen / 255.0f;
+	case GLUT_BLUE:
+		return col.peBlue / 255.0f;
+	default:
+		break;
+	}
+	return -1.0f;
+}
+
+void fgPlatformCopyColormap(int win)
+{
+	/* TODO */
+	fgWarning("glutCopyColormap not implemented yet on Win32");
+}

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_cursor_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_cursor_mswin.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_init_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_init_mswin.c Changed

@@ -102,17 +102,17 @@
         HDC context = CreateDC(fgDisplay.pDisplay.DisplayName,0,0,0);
         if( context )
         {
-	    fgDisplay.ScreenWidth  = GetDeviceCaps( context, HORZRES );
-	    fgDisplay.ScreenHeight = GetDeviceCaps( context, VERTRES );
-	    fgDisplay.ScreenWidthMM  = GetDeviceCaps( context, HORZSIZE );
-	    fgDisplay.ScreenHeightMM = GetDeviceCaps( context, VERTSIZE );
-	    DeleteDC(context);
+        fgDisplay.ScreenWidth  = GetDeviceCaps( context, HORZRES );
+        fgDisplay.ScreenHeight = GetDeviceCaps( context, VERTRES );
+        fgDisplay.ScreenWidthMM  = GetDeviceCaps( context, HORZSIZE );
+        fgDisplay.ScreenHeightMM = GetDeviceCaps( context, VERTSIZE );
+        DeleteDC(context);
         }
         else
-	    fgWarning("fgPlatformInitialize: "
-		      "CreateDC failed, Screen size info may be incorrect\n"
+        fgWarning("fgPlatformInitialize: "
+              "CreateDC failed, Screen size info may be incorrect\n"
           "This is quite likely caused by a bad '-display' parameter");
-      
+
     }
     /* Set the timer granularity to 1 ms */
     timeBeginPeriod ( 1 );
@@ -142,7 +142,7 @@
 void fgPlatformDeinitialiseInputDevices ( void )
 {
 #if !defined(_WIN32_WCE)
-	fghCloseInputDevices ();
+    fghCloseInputDevices ();
 #endif /* !defined(_WIN32_WCE) */
     fgState.JoysticksInitialised = GL_FALSE;
     fgState.InputDevsInitialised = GL_FALSE;
@@ -162,7 +162,7 @@
 
 void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext )
 {
-	/* Do nothing -- this is required for X11 */
+    /* Do nothing -- this is required for X11 */
 }
 
 /* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_input_devices_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_input_devices_mswin.c Changed

@@ -31,18 +31,20 @@
 #include <sys/types.h>
 #include <winbase.h>
 
-typedef struct {
+struct _serialport {
 HANDLE fh;
 COMMTIMEOUTS timeouts_save;
 DCB dcb_save;
-} SERIALPORT;
+};
+
+typedef struct _serialport SERIALPORT;
 
 /* Serial Port Prototypes */
-SERIALPORT *serial_open ( const char *device );
-void serial_close ( SERIALPORT *port );
-int serial_getchar ( SERIALPORT *port );
-int serial_putchar ( SERIALPORT *port, unsigned char ch );
-void serial_flush ( SERIALPORT *port );
+SERIALPORT *fg_serial_open ( const char *device );
+void fg_serial_close ( SERIALPORT *port );
+int fg_serial_getchar ( SERIALPORT *port );
+int fg_serial_putchar ( SERIALPORT *port, unsigned char ch );
+void fg_serial_flush ( SERIALPORT *port );
 
 
 void fgPlatformRegisterDialDevice ( const char *dial_device )
@@ -63,7 +65,7 @@
 
 
 /* Serial Port Functions */
-SERIALPORT *serial_open(const char *device){
+SERIALPORT *fg_serial_open(const char *device){
 HANDLE fh;
 DCB dcb={sizeof(DCB)};
 COMMTIMEOUTS timeouts;
@@ -90,12 +92,12 @@
 timeouts.WriteTotalTimeoutConstant=1;
 SetCommTimeouts(fh,&timeouts);
 
- serial_flush(port);
+ fg_serial_flush(port);
 
 return port;
 }
 
-void serial_close(SERIALPORT *port){
+void fg_serial_close(SERIALPORT *port){
 if (port){
 /* restore old port settings */
 SetCommState(port->fh,&port->dcb_save);
@@ -105,7 +107,7 @@
 }
 }
 
-int serial_getchar(SERIALPORT *port){
+int fg_serial_getchar(SERIALPORT *port){
 DWORD n;
 unsigned char ch;
 if (!port) return EOF;
@@ -114,13 +116,13 @@
 return EOF;
 }
 
-int serial_putchar(SERIALPORT *port, unsigned char ch){
+int fg_serial_putchar(SERIALPORT *port, unsigned char ch){
 DWORD n;
 if (!port) return 0;
 return WriteFile(port->fh,&ch,1,&n,NULL);
 }
 
-void serial_flush ( SERIALPORT *port )
+void fg_serial_flush ( SERIALPORT *port )
 {
 FlushFileBuffers(port->fh);
 }

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_internal_mswin.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_internal_mswin.h Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_joystick_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_joystick_mswin.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_main_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_main_mswin.c Changed

@@ -63,7 +63,7 @@
 #endif /* _WIN32_WCE */
 
 #ifdef _DEBUG
-/* 
+/*
 * WM_ message to string, for debugging
 * This is taken from the 8.0 SDK, so Windows 8 API and everything earlier is included
 */
@@ -191,7 +191,7 @@
 # endif /* _WIN32_WINNT >= 0x0500 */
 
 
-# if(_WIN32_WINNT >= 0x0501)
+# if(_WIN32_WINNT >= 0x0501) && defined(WM_INPUT_DEVICE_CHANGE)
 DEFINE_MESSAGE(WM_INPUT_DEVICE_CHANGE),
 # endif /* _WIN32_WINNT >= 0x0501 */
 
@@ -407,7 +407,7 @@
 # endif /* _WIN32_WINNT >= 0x0501 */
 
 
-# if(_WIN32_WINNT >= 0x0501)
+# if(_WIN32_WINNT >= 0x0501) && defined(WM_CLIPBOARDUPDATE)
 DEFINE_MESSAGE(WM_CLIPBOARDUPDATE),
 # endif /* _WIN32_WINNT >= 0x0501 */
 
@@ -474,7 +474,7 @@
 /* Check if we just wrapped */
 if (currTime32 < lastTime32)
 timeEpoch++;
- 
+
 lastTime32 = currTime32;
 
 return currTime32 | timeEpoch << 32;
@@ -542,7 +542,7 @@
 {
 SFG_Window *saved_window = fgStructure.CurrentWindow;
 
- /* On win32 we only have two states, window displayed and window not displayed (iconified) 
+ /* On win32 we only have two states, window displayed and window not displayed (iconified)
 * We map these to GLUT_FULLY_RETAINED and GLUT_HIDDEN respectively.
 */
 INVOKE_WCB( *window, WindowStatus, ( visState ? GLUT_FULLY_RETAINED:GLUT_HIDDEN ) );
@@ -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
@@ -592,7 +594,7 @@
 rControl = 0, rShift = 0, rAlt = 0;
 
 int keypress = -1;
- 
+
 /* if keydown, check for repeat */
 /* If repeat is globally switched off, it cannot be switched back on per window.
 * But if it is globally switched on, it can be switched off per window. This matches
@@ -601,7 +603,7 @@
 */
 if( keydown && ( fgState.KeyRepeat==GLUT_KEY_REPEAT_OFF || window->State.IgnoreKeyRepeat==GL_TRUE ) && (HIWORD(lParam) & KF_REPEAT) )
 return 1;
- 
+
 /* Remember the current modifiers state so user can query it from their callback */
 fgState.Modifiers = fgPlatformGetModifiers( );
 
@@ -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()
@@ -715,18 +719,16 @@
 keypress = GLUT_KEY_F4;
 }
 #endif
- 
- if( keypress != -1 )
- if (keydown)
- INVOKE_WCB( *window, Special,
- ( keypress,
- window->State.MouseX, window->State.MouseY )
- );
- else
- INVOKE_WCB( *window, SpecialUp,
- ( keypress,
- window->State.MouseX, window->State.MouseY )
- );
+
+ if(keypress != -1) {
+ if(keydown) {
+ INVOKE_WCB(*window, Special,
+ (keypress, window->State.MouseX, window->State.MouseY));
+ } else {
+ INVOKE_WCB(*window, SpecialUp,
+ (keypress, window->State.MouseX, window->State.MouseY));
+ }
+ }
 
 fgState.Modifiers = INVALID_MODIFIERS;
 
@@ -756,7 +758,7 @@
 mouse_pos.x = GET_X_LPARAM(mouse_pos_dw);
 mouse_pos.y = GET_Y_LPARAM(mouse_pos_dw);
 ScreenToClient( window->Window.Handle, &mouse_pos );
- 
+
 hwnd = ChildWindowFromPoint(window->Window.Handle, mouse_pos);
 if (hwnd && hwnd!=window->Window.Handle) /* can be NULL if mouse outside parent by the time we get here, or can be same as parent if we didn't find a child */
 {
@@ -874,7 +876,7 @@
 /* Update visibility state of the window */
 if (wParam==SIZE_MINIMIZED)
 fghPlatformOnWindowStatusNotify(window,GL_FALSE,GL_FALSE);
- else if (wParam==SIZE_RESTORED && !window->State.Visible)
+ else if ((wParam==SIZE_RESTORED || wParam == SIZE_MAXIMIZED) && !window->State.Visible)
 fghPlatformOnWindowStatusNotify(window,GL_TRUE,GL_FALSE);
 
 /* Check window visible, we don't want do anything when we get a WM_SIZE because the user or glutIconifyWindow minimized the window */
@@ -888,7 +890,7 @@
 width = LOWORD(lParam);
 height = HIWORD(lParam);
 #endif /* defined(_WIN32_WCE) */
- 
+
 /* Update state and call callback, if there was a change */
 fghOnReshapeNotify(window, width, height, GL_FALSE);
 }
@@ -935,15 +937,15 @@
 if (!IsIconic(window->Window.Handle))
 {
 RECT windowRect;
- 
+
 /* lParam contains coordinates of top-left of client area.
 * Get top-left of non-client area of window, matching coordinates of
- * glutInitPosition and glutPositionWindow, but not those of 
+ * glutInitPosition and glutPositionWindow, but not those of
 * glutGet(GLUT_WINDOW_X) and glutGet(GLUT_WINDOW_Y), which return
 * top-left of client area.
 */
 GetWindowRect( window->Window.Handle, &windowRect );
- 
+
 if (window->Parent)
 {
 /* For child window, we should return relative to upper-left
@@ -1031,7 +1033,7 @@
 {
 TRACKMOUSEEVENT tme;
 
- /* Cursor just entered window, set cursor look */ 
+ /* Cursor just entered window, set cursor look */
 fgSetCursor ( window, window->State.Cursor ) ;
 
 /* If an EntryFunc callback is specified by the user, also
@@ -1090,7 +1092,7 @@
 case WM_PAINT:
 {
 RECT rect;
- 
+
 /* As per docs, upon receiving WM_PAINT, first check if the update region is not empty before you call BeginPaint */
 if (GetUpdateRect(hWnd,&rect,FALSE))
 {
@@ -1279,7 +1281,7 @@
 {
 int wheel_number = 0; /* Only one scroll wheel on windows */
 #if defined(_WIN32_WCE)
- int modkeys = LOWORD(wParam); 
+ int modkeys = LOWORD(wParam);
 short ticks = (short)HIWORD(wParam);
 /* commented out as should not be needed here, mouse motion is processed in WM_MOUSEMOVE first:
 xPos = LOWORD(lParam); -- straight from docs, not consistent with mouse nutton and mouse motion above (which i think is wrong)
@@ -1296,10 +1298,10 @@
 
 window = fghWindowUnderCursor(window);
 
-		fgState.MouseWheelTicks += ticks;
+ fgState.MouseWheelTicks += ticks;
 if ( abs ( fgState.MouseWheelTicks ) >= WHEEL_DELTA )
-		{
-			int direction = ( fgState.MouseWheelTicks > 0 ) ? 1 : -1;
+ {
+ int direction = ( fgState.MouseWheelTicks > 0 ) ? 1 : -1;
 
 if( ! FETCH_WCB( *window, MouseWheel ) &&
 ! FETCH_WCB( *window, Mouse ) )
@@ -1309,7 +1311,7 @@

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_menu_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_menu_mswin.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_spaceball_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_spaceball_mswin.c Changed

@@ -7,6 +7,10 @@
 * Written by Evan Felix <karcaw at gmail.com>
 * Creation date: Sat Feb 4, 2012
 *
+ * Copyright (c) 2014 Jinrong Xie. All Rights Reserved.
+ * Written by Jinrong Xie <stonexjr at gmail.com>
+ * Modification date: Wed Dec 24, 2014
+ *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
@@ -24,35 +28,172 @@
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
+
 /*
- * This code is a very complicated way of doing nothing. 
- * But is needed for mswindows platform builds.
+ * Modified by Jinrong Xie <stonexjr at gmail.com> 12/24/2014
+ * for Space Navigator support on Windows.
+ * This code is enhanced by at least supporting 3Dconnexion's
+ * six degree of freedom navigator.
 */
 
+#if(_WIN32_WINNT >= 0x0501)
+
 #include <GL/freeglut.h>
+#include <stdlib.h>
 #include "../fg_internal.h"
 
+enum {
+ SPNAV_EVENT_ANY,
+ SPNAV_EVENT_MOTION_TRANSLATION,
+ SPNAV_EVENT_MOTION_ROTATION,
+ SPNAV_EVENT_BUTTON /* includes both press and release */
+};
+
+extern int fg_sball_initialized;
+unsigned int __fgSpaceKeystate = 0;
+RAWINPUTDEVICE __fgSpaceball = { 0x01, 0x08, 0x00, 0x00 };
+
 void fgPlatformInitializeSpaceball(void)
 {
-	return;
+ HWND hwnd;
+ fg_sball_initialized = 1;
+ if (!fgStructure.CurrentWindow)
+ {
+ fg_sball_initialized = 0;
+ return;
+ }
+ hwnd = fgStructure.CurrentWindow->Window.Handle;
+
+ {
+ BOOL ok;
+ UINT cbSize = sizeof(__fgSpaceball);
+ __fgSpaceball.hwndTarget = hwnd;
+ ok = RegisterRawInputDevices(&__fgSpaceball, 1, cbSize);
+
+ if (!ok){
+ __fgSpaceball.hwndTarget = NULL;
+ fg_sball_initialized = 0;
+ }
+ }
 }
 
 void fgPlatformSpaceballClose(void)
 {
-	return;
+ return;
 }
 
 int fgPlatformHasSpaceball(void)
 {
-	return 0;
+ return __fgSpaceball.hwndTarget ? 1 : 0;
 }
 
 int fgPlatformSpaceballNumButtons(void)
 {
-	return 0;
+ return 0;
 }
 
 void fgPlatformSpaceballSetWindow(SFG_Window *window)
 {
-	return;
+ return;
+}
+
+int fgIsSpaceballWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+ return 0;
+}
+
+void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+ #define LOGITECH_VENDOR_ID 0x46d
+ HRAWINPUT hRawInput = (HRAWINPUT)lParam;
+ UINT inputCode = (UINT)wParam;
+ UINT size;
+ BYTE *rawInputBuffer;
+ PRAWINPUT pRawInput;
+ UINT res;
+ RID_DEVICE_INFO sRidDeviceInfo;
+
+ if (!fg_sball_initialized)
+ {
+ fgPlatformInitializeSpaceball();
+ if (!fg_sball_initialized)
+ {
+ return;
+ }
+ }
+
+ res = GetRawInputData(hRawInput, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER));
+ if (res == -1)
+ return;
+
+ rawInputBuffer = malloc(size * sizeof *rawInputBuffer);
+ pRawInput = (PRAWINPUT)rawInputBuffer;
+
+ res = GetRawInputData(hRawInput, RID_INPUT, pRawInput, &size, sizeof(RAWINPUTHEADER));
+ if (res == -1)
+ return;
+ if (pRawInput->header.dwType != RIM_TYPEHID)
+ return;
+
+ sRidDeviceInfo.cbSize = sizeof(RID_DEVICE_INFO);
+ size = sizeof(RID_DEVICE_INFO);
+ res = GetRawInputDeviceInfo(pRawInput->header.hDevice, RIDI_DEVICEINFO, &sRidDeviceInfo, &size);
+ if (res == -1)
+ return;
+ {
+ SFG_Window* window = fgWindowByHandle(hwnd);
+ if ((window == NULL))
+ return;
+
+ if (sRidDeviceInfo.hid.dwVendorId == LOGITECH_VENDOR_ID)
+ {
+ // Motion data comes in two parts: motion type and
+ // displacement/rotation along three axis.
+ // Orientation is a right handed coordinate system with
+ // X goes right, Y goes up and Z goes towards viewer, e.g.
+ // the one used in OpenGL
+ if (pRawInput->data.hid.bRawData0 ==
+ SPNAV_EVENT_MOTION_TRANSLATION)
+ { // Translation vector
+ short* pnData = (short*)(&pRawInput->data.hid.bRawData1);
+ short X = pnData0;
+ short Y = -pnData2;
+ short Z = pnData1;
+ INVOKE_WCB(*window, SpaceMotion, (X, Y, Z));
+ }
+ else if (pRawInput->data.hid.bRawData0 ==
+ SPNAV_EVENT_MOTION_ROTATION)
+ { // Axis aligned rotation vector
+ short* pnData = (short*)(&pRawInput->data.hid.bRawData1);
+ short rX = pnData0;
+ short rY = -pnData2;
+ short rZ = pnData1;
+ INVOKE_WCB(*window, SpaceRotation, (rX, rY, rZ));
+ }
+ else if (pRawInput->data.hid.bRawData0 ==
+ SPNAV_EVENT_BUTTON)
+ { // State of the keys
+ unsigned long dwKeystate = *(unsigned long*)(&pRawInput->data.hid.bRawData1);
+ unsigned int state = GLUT_UP;
+ if (FETCH_WCB(*window, SpaceButton))
+ {
+ int i;
+ for (i = 0; i < 32; i++)
+ {
+ unsigned long stateBefore = __fgSpaceKeystate&(1 << i);
+ unsigned long stateNow = dwKeystate&(1 << i);
+
+ if (stateBefore && !stateNow)
+ INVOKE_WCB(*window, SpaceButton, (stateBefore, GLUT_UP));
+ if (!stateBefore && stateNow)
+ INVOKE_WCB(*window, SpaceButton, (stateNow, GLUT_DOWN));
+
+ }
+ }
+ __fgSpaceKeystate = dwKeystate;
+ }
+ }
+ }
 }
+
+#endif

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_state_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_state_mswin.c Changed

@@ -32,7 +32,7 @@
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
 unsigned char layer_type );
 
-/* 
+/*
 * Helper functions for getting client area from the window rect
 * and the window rect from the client area given the style of the window
 * (or a valid window pointer from which the style can be queried).
@@ -46,7 +46,14 @@
 * #include <GL/wglext.h>
 * So we copy the necessary parts out of it to support the multisampling query
 */
+#ifndef WGL_SAMPLES_ARB
 #define WGL_SAMPLES_ARB 0x2042
+#endif
+#ifndef WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9
+#endif
+
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
 
 #if defined(_WIN32_WCE)
 # include <Aygshell.h>
@@ -146,7 +153,7 @@
 HDC hdc = fgStructure.CurrentWindow->Window.pContext.Device;
 int iPixelFormat = GetPixelFormat( hdc );
 DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
- 
+
 returnValue = pfd.cColorBits;
 if (pfd.iPixelType==PFD_TYPE_RGBA)
 returnValue += pfd.cAlphaBits;
@@ -183,7 +190,7 @@
 GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect);
 #else
 ClientToScreen(fgStructure.CurrentWindow->Window.Handle, &topLeft);
- 
+
 if (fgStructure.CurrentWindow->Parent)
 /* For child window, we should return relative to upper-left
 * of parent's client area.
@@ -257,7 +264,7 @@
 */
 borderWidth = ((winRect.right-winRect.left)-(clientRect.right-clientRect.left))/2;
 captionHeight = (winRect.bottom-winRect.top)-(clientRect.bottom-clientRect.top)-borderWidth; /* include top border in caption height */
- 
+
 switch( eWhat )
 {
 case GLUT_WINDOW_BORDER_WIDTH:
@@ -284,12 +291,37 @@
 #endif /* defined(_WIN32_WCE) */
 return 0;
 
+ case GLUT_WINDOW_SRGB:
+ if( fgStructure.CurrentWindow != NULL ) {
+ static int attr = WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB;
+ static PFNWGLGETPIXELFORMATATTRIBIVARBPROC wglGetPixelFormatAttribivARB;
+ HDC hdc = fgStructure.CurrentWindow->Window.pContext.Device;
+ int ipixfmt = GetPixelFormat(hdc);
+ int val;
+
+ if(!wglGetPixelFormatAttribivARB) {
+ if(!(wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)wglGetProcAddress("wglGetPixelFormatAttribivARB"))) {
+ return 0;
+ }
+ }
+ if(wglGetPixelFormatAttribivARB(hdc, ipixfmt, 0, 1, &attr, &val)) {
+ return val;
+ }
+ }
+ return 0;
+
+	case GLUT_WINDOW_COLORMAP_SIZE:
+		if(!fgStructure.CurrentWindow) {
+			return 0;
+		}
+		return fgStructure.CurrentWindow->Window.cmap_size;
+
 default:
 fgWarning( "glutGet(): missing enum handle %d", eWhat );
 break;
 }
 
-	return -1;
+ return -1;
 }

_service:tar_scm:freeglut-3.0.0.tar.gz/src/mswin/fg_window_mswin.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/mswin/fg_window_mswin.c Changed

@@ -145,7 +145,7 @@
     PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
 
     /* If nothing fancy has been required, leave the context as it is */
-    if ( fghIsLegacyContextRequested() )
+    if ( fghIsLegacyContextRequested(window) )
     {
         return;
     }
@@ -185,62 +185,45 @@
 
 #if !defined(_WIN32_WCE)
 
-static void fghFillPFD( PIXELFORMATDESCRIPTOR *ppfd, HDC hdc, unsigned char layer_type )
+static void fghFillPFD(PIXELFORMATDESCRIPTOR *ppfd, HDC hdc, unsigned char layer_type)
 {
-  int flags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
-  if ( fgState.DisplayMode & GLUT_DOUBLE ) {
-        flags |= PFD_DOUBLEBUFFER;
-  }
-  if ( fgState.DisplayMode & GLUT_STEREO ) {
-    flags |= PFD_STEREO;
-  }
-
-#if defined(_MSC_VER)
-#pragma message( "fgSetupPixelFormat(): there is still some work to do here!" )
-#endif
-
-  /* Specify which pixel format do we opt for... */
-  ppfd->nSize = sizeof(PIXELFORMATDESCRIPTOR);
-  ppfd->nVersion = 1;
-  ppfd->dwFlags = flags;
-
-  if( fgState.DisplayMode & GLUT_INDEX ) {
-    ppfd->iPixelType = PFD_TYPE_COLORINDEX;
-    ppfd->cRedBits = 0;
-    ppfd->cGreenBits = 0;
-    ppfd->cBlueBits = 0;
-    ppfd->cAlphaBits = 0;
-  } else {
-    ppfd->iPixelType = PFD_TYPE_RGBA;
-    ppfd->cRedBits = 8;
-    ppfd->cGreenBits = 8;
-    ppfd->cBlueBits = 8;
-    ppfd->cAlphaBits = ( fgState.DisplayMode & GLUT_ALPHA ) ? 8 : 0;
-  }
-
-  ppfd->cColorBits = 24;
-  ppfd->cRedShift = 0;
-  ppfd->cGreenShift = 0;
-  ppfd->cBlueShift = 0;
-  ppfd->cAlphaShift = 0;
-  ppfd->cAccumBits = ( fgState.DisplayMode & GLUT_ACCUM ) ? 1 : 0;
-  ppfd->cAccumRedBits = 0;
-  ppfd->cAccumGreenBits = 0;
-  ppfd->cAccumBlueBits = 0;
-  ppfd->cAccumAlphaBits = 0;
-
-  /* Hmmm, or 32/0 instead of 24/8? */
-  ppfd->cDepthBits = 24;
-  ppfd->cStencilBits = 8;
-
-  ppfd->cAuxBuffers = (BYTE) fghNumberOfAuxBuffersRequested();
-  ppfd->iLayerType = layer_type;
-  ppfd->bReserved = 0;
-  ppfd->dwLayerMask = 0;
-  ppfd->dwVisibleMask = 0;
-  ppfd->dwDamageMask = 0;
-  
-  ppfd->cColorBits = (BYTE) GetDeviceCaps( hdc, BITSPIXEL );
+	int flags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
+	if(fgState.DisplayMode & GLUT_DOUBLE) {
+		flags |= PFD_DOUBLEBUFFER;
+	}
+	if(fgState.DisplayMode & GLUT_STEREO) {
+		flags |= PFD_STEREO;
+	}
+
+	/* Specify which pixel format do we opt for... */
+	memset(ppfd, 0, sizeof *ppfd);
+	ppfd->nSize = sizeof *ppfd;
+	ppfd->nVersion = 1;
+	ppfd->dwFlags = flags;
+
+	if(fgState.DisplayMode & GLUT_INDEX) {
+		ppfd->iPixelType = PFD_TYPE_COLORINDEX;
+		ppfd->cColorBits = 8;
+	} else {
+		ppfd->iPixelType = PFD_TYPE_RGBA;
+		ppfd->cColorBits = 24;
+	}
+	if(fgState.DisplayMode & GLUT_ALPHA) {
+		ppfd->cAlphaBits = 8;
+	}
+
+	ppfd->cAccumBits = (fgState.DisplayMode & GLUT_ACCUM) ? 1 : 0;
+
+	/* Hmmm, or 32/0 instead of 24/8? */
+	if(fgState.DisplayMode & GLUT_DEPTH) {
+		ppfd->cDepthBits = 24;
+	}
+	if(fgState.DisplayMode & GLUT_STENCIL) {
+		ppfd->cStencilBits = 8;
+	}
+
+	ppfd->cAuxBuffers = (BYTE)fghNumberOfAuxBuffersRequested();
+	ppfd->iLayerType = layer_type;
 }
 
 static void fghFillPixelFormatAttributes( int *attributes, const PIXELFORMATDESCRIPTOR *ppfd )
@@ -275,23 +258,24 @@
     return GL_TRUE;
 #else
     PIXELFORMATDESCRIPTOR pfd;
-    PIXELFORMATDESCRIPTOR* ppfd = &pfd;
     int pixelformat;
     HDC current_hDC;
-    GLboolean success;
+    GLboolean success = GL_FALSE;
 
     if (checkOnly)
       current_hDC = CreateDC(TEXT("DISPLAY"), NULL ,NULL ,NULL);
     else
       current_hDC = window->Window.pContext.Device;
 
-    fghFillPFD( ppfd, current_hDC, layer_type );
-    pixelformat = ChoosePixelFormat( current_hDC, ppfd );
+    fghFillPFD(&pfd, current_hDC, layer_type);
+    if(!(pixelformat = ChoosePixelFormat(current_hDC, &pfd))) {
+		return 0;
+	}
 
     /* windows hack for multismapling/sRGB */
     if ( ( fgState.DisplayMode & GLUT_MULTISAMPLE ) ||
          ( fgState.DisplayMode & GLUT_SRGB ) )
-    {        
+    {
         HGLRC rc, rc_before=wglGetCurrentContext();
         HWND hWnd;
         HDC hDC, hDC_before=wglGetCurrentDC();
@@ -307,7 +291,7 @@
 
         hWnd=CreateWindow(_T("FREEGLUT_dummy"), _T(""), WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_OVERLAPPEDWINDOW , 0,0,0,0, 0, 0, fgDisplay.pDisplay.Instance, 0 );
         hDC=GetDC(hWnd);
-        SetPixelFormat( hDC, pixelformat, ppfd );
+        SetPixelFormat(hDC, pixelformat, &pfd);
 
         rc = wglCreateContext( hDC );
         wglMakeCurrent(hDC, rc);
@@ -323,7 +307,7 @@
                 BOOL bValid;
                 float fAttributes = { 0, 0 };
                 UINT numFormats;
-                fghFillPixelFormatAttributes( attributes, ppfd );
+                fghFillPixelFormatAttributes(attributes, &pfd);
                 bValid = wglChoosePixelFormatARBProc(hDC, attributes, fAttributes, 1, &iPixelFormat, &numFormats);
 
                 if ( bValid && numFormats > 0 )
@@ -340,12 +324,24 @@
         UnregisterClass(_T("FREEGLUT_dummy"), fgDisplay.pDisplay.Instance);
     }
 
-    success = ( pixelformat != 0 ) && ( checkOnly || SetPixelFormat( current_hDC, pixelformat, ppfd ) );
+	if(pixelformat) {
+		DescribePixelFormat(current_hDC, pixelformat, sizeof pfd, &pfd);
 
-    if (checkOnly)
-        DeleteDC(current_hDC);
+		if(fgState.DisplayMode & GLUT_INDEX) {
+			if(pfd.iPixelType == PFD_TYPE_RGBA) goto end;
+		} else {
+			if(pfd.iPixelType == PFD_TYPE_COLORINDEX) goto end;
+		}
+	}
+
+    success = ( pixelformat != 0 ) && ( checkOnly || SetPixelFormat( current_hDC, pixelformat, &pfd) );
+
+end:
+	if(checkOnly) {
+		DeleteDC(current_hDC);
+	}
 
-    return success;
+	return success;
 #endif /* defined(_WIN32_WCE) */
 }
 
@@ -430,7 +426,7 @@
         windowRect.left     = clientRect->left;
         windowRect.top      = clientRect->top;
     }
-    
+
     /* done, copy windowRect to output */
     CopyRect(clientRect,&windowRect);
 }
@@ -467,7 +463,7 @@
     POINT topLeftClient = {0,0};
 
     freeglut_return_if_fail((window && window->Window.Handle));

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland Added

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_cursor_wl.c Added

@@ -0,0 +1,137 @@
+/*
+ * fg_cursor_wl.c
+ *
+ * The Wayland-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Thur Mar 19, 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <string.h>
+#include <GL/freeglut.h>
+#include "../fg_internal.h"
+
+/*
+ * Note: The arrangement of the table below depends on the fact that
+ * the "normal" GLUT_CURSOR_* values start a 0 and are consecutive.
+ */ 
+static char* cursorList = {
+ "UNSUPPORTED", /* GLUT_CURSOR_RIGHT_ARROW */
+ "left_ptr", /* GLUT_CURSOR_LEFT_ARROW */
+ "hand1", /* GLUT_CURSOR_INFO */
+ "UNSUPPORTED", /* GLUT_CURSOR_DESTROY */
+ "UNSUPPORTED", /* GLUT_CURSOR_HELP */
+ "UNSUPPORTED", /* GLUT_CURSOR_CYCLE */
+ "UNSUPPORTED", /* GLUT_CURSOR_SPRAY */
+ "watch", /* GLUT_CURSOR_WAIT */
+ "xterm", /* GLUT_CURSOR_TEXT */
+ "grabbing", /* GLUT_CURSOR_CROSSHAIR */
+ "UNSUPPORTED", /* GLUT_CURSOR_UP_DOWN */
+ "UNSUPPORTED", /* GLUT_CURSOR_LEFT_RIGHT */
+ "top_side", /* GLUT_CURSOR_TOP_SIDE */
+ "bottom_side", /* GLUT_CURSOR_BOTTOM_SIDE */
+ "left_side", /* GLUT_CURSOR_LEFT_SIDE */
+ "right_side", /* GLUT_CURSOR_RIGHT_SIDE */
+ "top_left_corner", /* GLUT_CURSOR_TOP_LEFT_CORNER */
+ "top_right_corner", /* GLUT_CURSOR_TOP_RIGHT_CORNER */
+ "bottom_right_corner", /* GLUT_CURSOR_BOTTOM_RIGHT_CORNER */
+ "bottom_left_corner" /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */
+};
+
+void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
+{
+ /*
+ * XXX FULL_CROSSHAIR demotes to plain CROSSHAIR. Old GLUT allows
+ * for this, but if there is a system that easily supports a full-
+ * window (or full-screen) crosshair, we might consider it.
+ */
+ int cursorIDToUse =
+ ( cursorID == GLUT_CURSOR_FULL_CROSSHAIR ) ? GLUT_CURSOR_CROSSHAIR : cursorID;
+
+ char* cursor;
+
+ if( ( cursorIDToUse >= 0 ) &&
+ ( cursorIDToUse < sizeof( cursorList ) / sizeof( cursorList0 ) ) ) {
+
+ cursor = cursorListcursorIDToUse;
+
+ /* if the type is UNSUPPORTED, fall back to GLUT_CURSOR_LEFT_ARROW */
+ if ( ! strcmp( cursor, "UNSUPPORTED" ) )
+ {
+ fgWarning( "glutSetCursor(): cursor type unsupported under Wayland : %d",
+ cursorIDToUse );
+ cursor = "left_ptr";
+ }
+ } else {
+ switch( cursorIDToUse )
+ {
+ case GLUT_CURSOR_NONE:
+ case GLUT_CURSOR_INHERIT:
+ cursor = NULL;
+ break;
+
+ default:
+ fgError( "Unknown cursor type: %d", cursorIDToUse );
+ return;
+ }
+ }
+
+ if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
+ if( window->Parent )
+ window->Window.pContext.cursor =
+ window->Parent->Window.pContext.cursor;
+ } else {
+ window->Window.pContext.cursor = wl_cursor_theme_get_cursor(
+ fgDisplay.pDisplay.cursor_theme,
+ cursor );
+ if ( ! window->Window.pContext.cursor )
+ fgError( "Failed to create cursor" );
+ }
+}
+
+
+void fgPlatformWarpPointer ( int x, int y )
+{
+ /* unsupported under Wayland */
+ fgWarning( "glutWarpPointer(): function unsupported under Wayland" );
+}
+
+void fghPlatformGetCursorPos(const SFG_Window *window, GLboolean client, SFG_XYUse *mouse_pos)
+{
+ /* Get current pointer location relative to top-left of client area of window (if client is true and window is not NULL)
+ * We cannot get current pointer location in screen coordinates under Wayland, so inform the user and return -1 is this case
+ */
+
+ if (client && window)
+ {
+ mouse_pos->X = window->State.MouseX;
+ mouse_pos->Y = window->State.MouseY;
+ }
+ else
+ {
+ fgWarning( "glutGetCursorPos(): cannot get screen position under Wayland" );
+ mouse_pos->X = -1;
+ mouse_pos->Y = -1;
+ }
+
+ mouse_pos->Use = GL_TRUE;
+}
+

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_ext_wl.c Added

@@ -0,0 +1,49 @@
+/*
+ * fg_ext_wl.c
+ *
+ * Wayland-specific functions related to OpenGL extensions.
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Wed Mar 25 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <string.h>
+#include <GL/freeglut.h>
+#include "../fg_internal.h"
+
+GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
+{
+ /* optimization: quick initial check */
+ if( strncmp( procName, "glut", 4 ) != 0 )
+ return NULL;
+
+#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;
+ CHECK_NAME(glutJoystickFunc);
+ CHECK_NAME(glutForceJoystickFunc);
+ CHECK_NAME(glutGameModeString);
+ CHECK_NAME(glutEnterGameMode);
+ CHECK_NAME(glutLeaveGameMode);
+ CHECK_NAME(glutGameModeGet);
+#undef CHECK_NAME
+
+ return NULL;
+}
+

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_gamemode_wl.c Added

@@ -0,0 +1,161 @@
+/*
+ * fg_gamemode_wl.c
+ *
+ * The game mode handling code.
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Sun Mar 23 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "../fg_internal.h"
+
+/* Pointer locking is a Weston-specific WIP protocol (for now)
+ *
+ * #include "pointer-lock-client-protocol.h"
+ * #include "relative-pointer-client-protocol.h"
+ *
+ * static struct _wl_relative_pointer_manager* relative_pointer_manager;
+ * static struct _wl_pointer_lock* pointer_lock;
+ *
+ * static struct _wl_relative_pointer* relative_pointer;
+ * static struct _wl_locked_pointer* locked_pointer;
+ *
+ *
+ * static void fghRelativeMotion( void* data, struct _wl_relative_pointer
+ * pointer, uint32_t time,
+ * wl_fixed_t x_w, wl_fixed_t y_w,
+ * wl_fixed_t x_noacc, wl_fixed_t y_noacc )
+ * {
+ * SFG_Window* win = fgStructure.CurrentWindow;
+ * win->State.MouseX = wl_fixed_to_int( x_w );
+ * win->State.MouseY = wl_fixed_to_int( y_w );
+ * INVOKE_WCB( *win, Passive, ( win->State.MouseX,
+ * win->State.MouseY ) );
+ * }
+ * static const struct _wl_relative_pointer_listener
+ * fghRelativeListener =
+ * {
+ * fghRelativeMotion
+ * };
+ *
+ * static void fghLockedLocked( void* data, struct _wl_locked_pointer
+ * pointer, uint32_t serial )
+ * {
+ * fgPlatformRememberState();
+ * fgPlatformSetCursor( win, GLUT_CURSOR_NONE ):
+ * }
+ * static void fghLockedUnlocked( void* data, struct _wl_locked_pointer
+ * pointer )
+ * {
+ * fgPlatformRestoreState();
+ * }
+ * static const struct _wl_locked_pointer_listener
+ * fghLockedListener =
+ * {
+ * fghLockedLocked,
+ * fghLockedUnlocked
+ * };
+ */
+
+
+static struct wl_cursor* saved_cursor;
+
+/*
+ * Remembers the current visual settings, so that
+ * we can change them and restore later...
+ */
+void fgPlatformRememberState( void )
+{
+ SFG_Window* win = fgStructure.CurrentWindow;
+ saved_cursor = win->Window.pContext.cursor;
+}
+
+/*
+ * Restores the previously remembered visual settings
+ */
+void fgPlatformRestoreState( void )
+{
+ SFG_Window* win = fgStructure.CurrentWindow;
+ win->Window.pContext.cursor = saved_cursor;
+}
+
+/*
+ * * Private function to get the virtual maximum screen extent
+ * */
+GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
+{
+ /*
+ * under Wayland, just return the size of the window,
+ * at least until we start messing with the outputs...
+ */
+ *x = window->State.Width;
+ *y = window->State.Height;
+}
+
+/*
+ * Changes the current display mode to match user's settings
+ */
+GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
+{
+ /* Such a protocol is being studied in Wayland */
+ return GL_FALSE;
+}
+
+
+void fgPlatformEnterGameMode( void )
+{
+ SFG_Window* win = fgStructure.CurrentWindow;
+ struct wl_region* region;
+
+ region = wl_compositor_create_region (
+ fgDisplay.pDisplay.compositor );
+ wl_region_add( region, 0, 0,
+ win->State.Width,
+ win->State.Height );
+ /*
+ * relative_pointer =
+ * _wl_relative_pointer_manager_get_relative_pointer (
+ * relative_pointer_manager,
+ * fgDisplay.pDisplay.seat );
+ * _wl_relative_pointer_add_listener( relative_pointer,
+ * &fghRelativeListener,
+ * NULL );
+ * locked_pointer = _wl_pointer_lock_lock_pointer (
+ * pointer_lock,
+ * win->Window.pContext.surface,
+ * fgDisplay.pDisplay.seat,
+ * NULL);
+ * _wl_locked_pointer_add_listener( locked_pointer,
+ * &fghLockedListener,
+ * NULL );
+ */
+ wl_region_destroy( region );
+}
+
+void fgPlatformLeaveGameMode( void )
+{
+ /* 
+ * _wl_locked_pointer_destroy( locked_pointer );
+ * _wl_relative_pointer_release( relative_pointer );
+ */
+}
+

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_init_wl.c Added

@@ -0,0 +1,134 @@
+/*
+ * fg_init_wl.c
+ *
+ * Various freeglut Wayland initialization functions.
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Tue Mar 17, 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define FREEGLUT_BUILDING_LIB
+#include <string.h>
+#include <GL/freeglut.h>
+#include "fg_internal.h"
+#include "egl/fg_init_egl.h"
+
+void fgPlatformInitialiseInputDevices( void );
+void fgPlatformCloseInputDevices( void );
+
+
+static void fghRegistryGlobal( void* data,
+ struct wl_registry* registry,
+ uint32_t id,
+ const char* interface,
+ uint32_t version )
+{
+ SFG_PlatformDisplay* pDisplay = data;
+
+ if ( ! strcmp( interface, "wl_compositor" ) )
+ pDisplay->compositor = wl_registry_bind ( registry, id,
+ &wl_compositor_interface, 1 );
+ else if ( ! strcmp( interface, "wl_shell" ) )
+ pDisplay->shell = wl_registry_bind ( registry, id,
+ &wl_shell_interface, 1 );
+ else if ( ! strcmp( interface, "wl_seat" ) )
+ pDisplay->seat = wl_registry_bind ( registry, id,
+ &wl_seat_interface, 1 );
+ else if ( ! strcmp( interface, "wl_shm" ) )
+ pDisplay->shm = wl_registry_bind ( registry, id,
+ &wl_shm_interface, 1 );
+}
+static void fghRegistryGlobalRemove( void* data,
+ struct wl_registry* registry,
+ uint32_t id )
+{
+}
+static const struct wl_registry_listener fghRegistryListener =
+{
+ fghRegistryGlobal,
+ fghRegistryGlobalRemove
+};
+
+
+static void fghInitialiseCursorTheme(void)
+{
+ fgDisplay.pDisplay.cursor_theme = wl_cursor_theme_load (
+ "default", 32,
+ fgDisplay.pDisplay.shm );
+};
+
+void fgPlatformInitialize( const char* displayName )
+{
+ fgDisplay.pDisplay.display = wl_display_connect( NULL );
+
+ if( fgDisplay.pDisplay.display == NULL )
+ fgError( "failed to connect to a Wayland compositor" );
+
+ fgDisplay.pDisplay.registry = wl_display_get_registry(
+ fgDisplay.pDisplay.display );
+ wl_registry_add_listener( fgDisplay.pDisplay.registry,
+ &fghRegistryListener,
+ &fgDisplay.pDisplay );
+ wl_display_roundtrip( fgDisplay.pDisplay.display );
+
+ if( fgDisplay.pDisplay.compositor == NULL ||
+ fgDisplay.pDisplay.shell == NULL ||
+ fgDisplay.pDisplay.seat == NULL ||
+ fgDisplay.pDisplay.shm == NULL )
+ fgError( "failed to discover all needed compositor interfaces" );
+
+ fghInitialiseCursorTheme();
+
+ fghPlatformInitializeEGL();
+
+ /* Get start time */
+ fgState.Time = fgSystemTime();
+
+ fgState.Initialised = GL_TRUE;
+
+ atexit(fgDeinitialize);
+
+ /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
+ fgPlatformInitialiseInputDevices();
+}
+
+
+void fgPlatformDeinitialiseInputDevices ( void )
+{
+ fgPlatformCloseInputDevices();
+
+ fgState.InputDevsInitialised = GL_FALSE;
+}
+
+
+void fgPlatformCloseDisplay ( void )
+{
+ wl_cursor_theme_destroy( fgDisplay.pDisplay.cursor_theme );
+
+ wl_shm_destroy( fgDisplay.pDisplay.shm );
+ wl_seat_destroy( fgDisplay.pDisplay.seat );
+ wl_shell_destroy( fgDisplay.pDisplay.shell );
+ wl_compositor_destroy( fgDisplay.pDisplay.compositor );
+ wl_registry_destroy( fgDisplay.pDisplay.registry );
+
+ wl_display_disconnect( fgDisplay.pDisplay.display );
+}
+

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_input_devices_wl.c Added

@@ -0,0 +1,439 @@
+/*
+ * fg_input_devices_wl.c
+ *
+ * Handles Wayland input devices : keyboard, pointer, touchscreen.
+ *
+ * Written by Manuel Bachmann <tarnyko@tarnyko.net> 2015
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Creation date: Thur Mar 19 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifdef __linux__
+#include <linux/input.h>
+#else
+#define BTN_LEFT 0x110
+#define BTN_RIGHT 0x111
+#define BTN_MIDDLE 0x112
+#endif
+#include <sys/mman.h>
+#include <GL/freeglut.h>
+#include "../fg_internal.h"
+
+/*
+ * This function will effectively set the pointer (mouse) cursor
+ * depending on the GLUT_CURSOR_* choice.
+ */
+void fghPointerSetCursor( SFG_Window* window,
+ struct wl_pointer* pointer,
+ uint32_t serial )
+{
+ struct wl_cursor_image* image;
+ struct wl_buffer* buffer;
+
+ image = window->Window.pContext.cursor->images0;
+ buffer = wl_cursor_image_get_buffer( image );
+
+ wl_surface_attach( window->Window.pContext.cursor_surface, buffer,
+ 0, 0 );
+ wl_surface_damage( window->Window.pContext.cursor_surface, 0, 0,
+ image->width, image->height );
+ wl_surface_commit( window->Window.pContext.cursor_surface );
+
+ wl_pointer_set_cursor( pointer, serial,
+ window->Window.pContext.cursor_surface,
+ image->hotspot_x, image->hotspot_y );
+}
+
+/*
+ * This function will interpret a keyboard keysym, and call the
+ * possible callbacks accordingly.
+ */
+void fghKeyboardInterpretKeysym( SFG_Window* window,
+ uint32_t key,
+ xkb_keysym_t sym,
+ uint32_t state )
+{
+ FGCBKeyboardUC keyboard_cb;
+ FGCBSpecialUC special_cb;
+ FGCBUserData keyboard_ud;
+ FGCBUserData special_ud;
+ char string16;
+ int special = -1;
+
+ /* GLUT API tells us to have two separate callbacks, one for
+ * the ASCII translateable keypresses, and one for all the
+ * others, which need to be translated to GLUT_KEY_Xs... */
+ if( state )
+ {
+ keyboard_cb = (FGCBKeyboardUC)( FETCH_WCB( *window, Keyboard ));
+ special_cb = (FGCBSpecialUC) ( FETCH_WCB( *window, Special ));
+ keyboard_ud = FETCH_USER_DATA_WCB( *window, Keyboard );
+ special_ud = FETCH_USER_DATA_WCB( *window, Special );
+ }
+ else
+ {
+ keyboard_cb = (FGCBKeyboardUC)( FETCH_WCB( *window, KeyboardUp ));
+ special_cb = (FGCBSpecialUC) ( FETCH_WCB( *window, SpecialUp ));
+ keyboard_ud = FETCH_USER_DATA_WCB( *window, KeyboardUp );
+ special_ud = FETCH_USER_DATA_WCB( *window, SpecialUp );
+ }
+
+ switch( sym )
+ {
+ case XKB_KEY_F1: special = GLUT_KEY_F1; break;
+ case XKB_KEY_F2: special = GLUT_KEY_F2; break;
+ case XKB_KEY_F3: special = GLUT_KEY_F3; break;
+ case XKB_KEY_F4: special = GLUT_KEY_F4; break;
+ case XKB_KEY_F5: special = GLUT_KEY_F5; break;
+ case XKB_KEY_F6: special = GLUT_KEY_F6; break;
+ case XKB_KEY_F7: special = GLUT_KEY_F7; break;
+ case XKB_KEY_F8: special = GLUT_KEY_F8; break;
+ case XKB_KEY_F9: special = GLUT_KEY_F9; break;
+ case XKB_KEY_F10: special = GLUT_KEY_F10; break;
+ case XKB_KEY_F11: special = GLUT_KEY_F11; break;
+ case XKB_KEY_F12: special = GLUT_KEY_F12; break;
+ case XKB_KEY_Left: special = GLUT_KEY_LEFT; break;
+ case XKB_KEY_Right: special = GLUT_KEY_RIGHT; break;
+ case XKB_KEY_Up: special = GLUT_KEY_UP; break;
+ case XKB_KEY_Down: special = GLUT_KEY_DOWN; break;
+ case XKB_KEY_Page_Up: special = GLUT_KEY_PAGE_UP; break;
+ case XKB_KEY_Page_Down: special = GLUT_KEY_PAGE_DOWN; break;
+ case XKB_KEY_Home: special = GLUT_KEY_HOME; break;
+ case XKB_KEY_End: special = GLUT_KEY_END; break;
+ case XKB_KEY_Insert: special = GLUT_KEY_INSERT; break;
+ case XKB_KEY_Num_Lock: special = GLUT_KEY_NUM_LOCK; break;
+ case XKB_KEY_Begin: special = GLUT_KEY_BEGIN; break;
+ case XKB_KEY_Delete: special = GLUT_KEY_DELETE; break;
+ case XKB_KEY_Shift_L: special = GLUT_KEY_SHIFT_L; break;
+ case XKB_KEY_Shift_R: special = GLUT_KEY_SHIFT_R; break;
+ case XKB_KEY_Control_L: special = GLUT_KEY_CTRL_L; break;
+ case XKB_KEY_Control_R: special = GLUT_KEY_CTRL_R; break;
+ case XKB_KEY_Alt_L: special = GLUT_KEY_ALT_L; break;
+ case XKB_KEY_Alt_R: special = GLUT_KEY_ALT_R; break;
+ }
+
+ if( special_cb && (special != -1) )
+ {
+ fgSetWindow( window );
+ special_cb( special, window->State.MouseX, window->State.MouseY, special_ud );
+ }
+ else if( keyboard_cb && (special == -1) )
+ {
+ fgSetWindow( window );
+ xkb_keysym_to_utf8( sym, string, sizeof( string ) );
+ keyboard_cb( string0, window->State.MouseX, window->State.MouseY, keyboard_ud );
+ }
+}
+
+
+/*
+ * Touchscreen section
+ * For now, let us pretend it is a mouse with only one button
+ */
+static void fghTouchDown( void* data, struct wl_touch* touch,
+ uint32_t serial, uint32_t time,
+ struct wl_surface* surface,
+ int32_t id,
+ wl_fixed_t x_w, wl_fixed_t y_w )
+{
+ SFG_Window* win = fgStructure.CurrentWindow;
+ win->State.MouseX = wl_fixed_to_int( x_w );
+ win->State.MouseY = wl_fixed_to_int( y_w );
+ INVOKE_WCB( *win, Mouse, ( GLUT_LEFT_BUTTON,
+ GLUT_DOWN,
+ win->State.MouseX,
+ win->State.MouseY ) );
+}
+static void fghTouchUp( void* data, struct wl_touch* touch,
+ uint32_t serial, uint32_t time,
+ int32_t id )
+{
+ SFG_Window* win = fgStructure.CurrentWindow;
+ INVOKE_WCB( *win, Mouse, ( GLUT_LEFT_BUTTON,
+ GLUT_UP,
+ win->State.MouseX,
+ win->State.MouseY ) );
+}
+static void fghTouchMotion( void* data, struct wl_touch* touch,
+ uint32_t time, int32_t id,
+ wl_fixed_t x_w, wl_fixed_t y_w )
+{
+ SFG_Window* win = fgStructure.CurrentWindow;
+ win->State.MouseX = wl_fixed_to_int( x_w );
+ win->State.MouseY = wl_fixed_to_int( y_w );
+ INVOKE_WCB( *win, Motion, ( win->State.MouseX,
+ win->State.MouseY ) );
+}
+static void fghTouchFrame( void* data, struct wl_touch* touch )
+{
+}
+static void fghTouchCancel( void* data, struct wl_touch* touch )
+{
+}
+static const struct wl_touch_listener fghTouchListener =
+{
+	fghTouchDown,
+	fghTouchUp,
+	fghTouchMotion,
+	fghTouchFrame,
+	fghTouchCancel
+};
+

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_internal_wl.h Added

@@ -0,0 +1,174 @@
+/*
+ * fg_internal_wl.h
+ *
+ * The freeglut library private include file.
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Tue Mar 17, 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef FREEGLUT_INTERNAL_WL_H
+#define FREEGLUT_INTERNAL_WL_H
+
+
+/* -- PLATFORM-SPECIFIC INCLUDES ------------------------------------------- */
+#include "egl/fg_internal_egl.h"
+#include <wayland-egl.h>
+#include <wayland-client.h>
+#include <wayland-cursor.h>
+#include <xkbcommon/xkbcommon.h>
+
+
+/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
+/* The structure used by display initialization in fg_init.c */
+typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
+struct tagSFG_PlatformDisplay
+{
+ struct tagSFG_PlatformDisplayEGL egl;
+
+ struct wl_display* display; /* The display we are being run in */
+ struct wl_registry* registry; /* The global interface registry */
+ struct wl_compositor* compositor; /* The compositor */
+ struct wl_shell* shell; /* The shell, AKA window manager */
+ struct wl_seat* seat; /* The seat, references input devices */
+
+ struct xkb_context* xkb_context; /* The global XKB keyboard context */
+ struct xkb_state* xkb_state; /* The current XKB keyboard state */
+ struct wl_keyboard* keyboard; /* The keyboard input device */
+ struct wl_pointer* pointer; /* The pointer input device (mouse) */
+ struct wl_touch* touch; /* The touchscreen input device */
+
+ struct wl_shm* shm; /* The software rendering engine */
+ struct wl_cursor_theme* cursor_theme; /* The pointer cursor theme */
+};
+
+
+/* The structure used by window creation in fg_window.c */
+typedef struct tagSFG_PlatformContext SFG_PlatformContext;
+struct tagSFG_PlatformContext
+{
+ struct tagSFG_PlatformContextEGL egl;
+ GLboolean pointer_button_pressed;
+
+ struct wl_surface* surface; /* The drawing surface */
+ struct wl_shell_surface* shsurface; /* The shell surface, has states */
+ struct wl_egl_window* egl_window; /* Binding between WL/EGL surfaces */
+
+ struct wl_cursor* cursor; /* The active cursor */
+ struct wl_surface* cursor_surface; /* The active cursor surface */
+};
+
+
+/* The window state description. This structure should be kept portable. */
+typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
+struct tagSFG_PlatformWindowState
+{
+ int OldWidth; /* Window width from before a resize */
+ int OldHeight; /* " height " " " " */
+};
+
+
+/* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */
+/*
+ * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c"
+ * interspersed
+ */
+# ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+# endif
+# ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+# endif
+
+#include <errno.h>
+#include <string.h>
+
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+# define HAVE_USB_JS 1
+
+# include <sys/joystick.h>
+# define JS_DATA_TYPE joystick
+# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+# endif
+
+# if defined(__linux__)
+# include <linux/joystick.h>
+
+/* check the joystick driver version */
+# if defined(JS_VERSION) && JS_VERSION >= 0x010000
+# define JS_NEW
+# endif
+# else /* Not BSD or Linux */
+# ifndef JS_RETURN
+
+ /*
+ * We'll put these values in and that should
+ * allow the code to at least compile when there is
+ * no support. The JS open routine should error out
+ * and shut off all the code downstream anyway and if
+ * the application doesn't use a joystick we'll be fine.
+ */
+
+ struct JS_DATA_TYPE
+ {
+ int buttons;
+ int x;
+ int y;
+ };
+
+# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+# endif
+# endif
+
+/* XXX It might be better to poll the operating system for the numbers of buttons and
+ * XXX axes and then dynamically allocate the arrays.
+ */
+# define _JS_MAX_AXES 16
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
+struct tagSFG_PlatformJoystick
+{
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+ struct os_specific_s *os;
+# endif
+
+# ifdef JS_NEW
+ struct js_event js;
+ int tmp_buttons;
+ float tmp_axes _JS_MAX_AXES ;
+# else
+ struct JS_DATA_TYPE js;
+# endif
+
+ char fname 128 ;
+ int fd;
+};
+
+
+/* Menu font and color definitions */
+#define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18
+
+#define FREEGLUT_MENU_PEN_FORE_COLORS {0.0f, 0.0f, 0.0f, 1.0f}
+#define FREEGLUT_MENU_PEN_BACK_COLORS {0.70f, 0.70f, 0.70f, 1.0f}
+#define FREEGLUT_MENU_PEN_HFORE_COLORS {0.0f, 0.0f, 0.0f, 1.0f}
+#define FREEGLUT_MENU_PEN_HBACK_COLORS {1.0f, 1.0f, 1.0f, 1.0f}
+
+
+#endif /* FREEGLUT_INTERNAL_WL_H */

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_main_wl.c Added

@@ -0,0 +1,146 @@
+/*
+ * fg_main_wl.c
+ *
+ * The Wayland-specific windows message processing methods.
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Sun Mar 22 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "../fg_internal.h"
+#include <errno.h>
+#include <poll.h>
+
+void fgPlatformFullScreenToggle( SFG_Window *win );
+void fgPlatformPositionWindow( SFG_Window *window, int x, int y );
+void fgPlatformReshapeWindow( SFG_Window *window, int width, int height );
+void fgPlatformPushWindow( SFG_Window *window );
+void fgPlatformPopWindow( SFG_Window *window );
+void fgPlatformHideWindow( SFG_Window *window );
+void fgPlatformIconifyWindow( SFG_Window *window );
+void fgPlatformShowWindow( SFG_Window *window );
+
+
+fg_time_t fgPlatformSystemTime( void )
+{
+#ifdef CLOCK_MONOTONIC
+ struct timespec now;
+ clock_gettime(CLOCK_MONOTONIC, &now);
+ return now.tv_nsec/1000000 + now.tv_sec*1000;
+#elif defined(HAVE_GETTIMEOFDAY)
+ struct timeval now;
+ gettimeofday( &now, NULL );
+ return now.tv_usec/1000 + now.tv_sec*1000;
+#endif
+}
+
+void fgPlatformSleepForEvents( fg_time_t msec )
+{
+ struct pollfd pfd;
+ int err;
+
+ pfd.fd = wl_display_get_fd( fgDisplay.pDisplay.display );
+ pfd.events = POLLIN | POLLERR | POLLHUP;
+
+ wl_display_dispatch_pending( fgDisplay.pDisplay.display );
+ if ( ! wl_display_flush( fgDisplay.pDisplay.display ) )
+ {
+ err = poll( &pfd, 1, msec );
+
+ if( ( -1 == err ) && ( errno != EINTR ) )
+ fgWarning ( "freeglut poll() error: %d", errno );
+ }
+}
+
+
+void fgPlatformProcessSingleEvent( void )
+{
+ SFG_Window *win = fgStructure.CurrentWindow;
+
+ wl_display_dispatch_pending( fgDisplay.pDisplay.display );
+ INVOKE_WCB( *win, Display, ( ) );
+}
+
+void fgPlatformMainLoopPreliminaryWork( void )
+{
+ /* Under Wayland, this is a no-op */
+}
+
+void fgPlatformInitWork( SFG_Window* window )
+{
+ /* Under Wayland, all events happen relative to input handlers
+ * -> this is a no-op
+ */
+ return;
+}
+
+void fgPlatformPosResZordWork( SFG_Window* window, unsigned int workMask )
+{
+ if( workMask & GLUT_FULL_SCREEN_WORK )
+ fgPlatformFullScreenToggle( window );
+ if( workMask & GLUT_POSITION_WORK )
+ fgPlatformPositionWindow( window, window->State.DesiredXpos, window->State.DesiredYpos );
+ if( workMask & GLUT_SIZE_WORK )
+ fgPlatformReshapeWindow ( window, window->State.DesiredWidth, window->State.DesiredHeight );
+ if( workMask & GLUT_ZORDER_WORK )
+ {
+ if( window->State.DesiredZOrder < 0 )
+ fgPlatformPushWindow( window );
+ else
+ fgPlatformPopWindow( window );
+ }
+}
+
+void fgPlatformVisibilityWork( SFG_Window* window )
+{
+ /* Visibility status of window gets updated in the window message handlers above 
+ */
+ SFG_Window *win = window;
+ switch (window->State.DesiredVisibility)
+ {
+ case DesireHiddenState:
+ fgPlatformHideWindow( window );
+ break;
+ case DesireIconicState:
+ /* Call on top-level window */
+ while (win->Parent)
+ win = win->Parent;
+ fgPlatformIconifyWindow( win );
+ break;
+ case DesireNormalState:
+ fgPlatformShowWindow( window );
+ break;
+ }
+}
+
+/* dummy functions, not applicable on wayland */
+void fgPlatformSetColor(int idx, float r, float g, float b)
+{
+}
+
+float fgPlatformGetColor(int idx, int comp)
+{
+}
+
+void fgPlatformCopyColormap(int win)
+{
+}

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_state_wl.c Added

@@ -0,0 +1,150 @@
+/*
+ * fg_state_wl.c
+ *
+ * Wayland-specific freeglut state query methods.
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Sun Mar 23 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "fg_internal.h"
+#include "egl/fg_state_egl.h"
+
+int fgPlatformGlutDeviceGet ( GLenum eWhat )
+{
+ switch( eWhat )
+ {
+ case GLUT_HAS_KEYBOARD:
+ if( fgDisplay.pDisplay.keyboard )
+ return 1;
+ else
+ return 0;
+
+ case GLUT_HAS_MOUSE:
+ /* we want the touchscreen to behave like a mouse,
+ * so let us pretend it is one.
+ */
+ if( fgDisplay.pDisplay.pointer ||
+ fgDisplay.pDisplay.touch )
+ return 1;
+ else
+ return 0;
+
+ case GLUT_NUM_MOUSE_BUTTONS:
+ /* Wayland has no way of telling us how much buttons
+ * a mouse has, unless the actual event gets sent to
+ * the client. As we are only handling 3 buttons
+ * currently, return this fixed number for now.
+ */
+ if( fgDisplay.pDisplay.pointer )
+ return 3;
+ /* touchscreen is considered as having one button */
+ else if( fgDisplay.pDisplay.touch )
+ return 1;
+ else
+ return 0;
+
+ default:
+ fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
+ return -1;
+ }
+}
+
+
+int fgPlatformGlutGet ( GLenum eWhat )
+{
+ switch( eWhat )
+ {
+
+ /*
+ * Those calls are pointless under Wayland, so inform the user
+ */
+ case GLUT_WINDOW_X:
+ case GLUT_WINDOW_Y:
+ {
+ if( fgStructure.CurrentWindow == NULL )
+ {
+ return 0;
+ }
+ else
+ {
+ fgWarning( "glutGet(): GLUT_WINDOW_X/Y properties "
+ "unsupported under Wayland" );
+ return -1;
+ }
+ }
+
+ /*
+ * TODO : support this correctly once we will start drawing
+ * client-side decorations
+ */
+ case GLUT_WINDOW_BORDER_WIDTH:
+ case GLUT_WINDOW_HEADER_HEIGHT:
+ {
+ if( fgStructure.CurrentWindow == NULL ||
+ fgStructure.CurrentWindow->Parent )
+ /* can't get widths/heights if no current window
+ * and child windows don't have borders */
+ return 0;
+
+ return 0;
+ }
+
+ case GLUT_WINDOW_WIDTH:
+ case GLUT_WINDOW_HEIGHT:
+ {
+ if( fgStructure.CurrentWindow == NULL )
+ return 0;
+
+ switch ( eWhat )
+ {
+ case GLUT_WINDOW_WIDTH:
+ return fgStructure.CurrentWindow->State.Width;
+ case GLUT_WINDOW_HEIGHT:
+ return fgStructure.CurrentWindow->State.Height;
+ }
+ }
+
+ /* Colormap size is handled in a bit different way than all the rest */
+ case GLUT_WINDOW_COLORMAP_SIZE:
+ {
+ if( fgStructure.CurrentWindow == NULL )
+ {
+ return 0;
+ }
+ else
+ {
+ int result = 0;
+	 if ( ! eglGetConfigAttrib( fgDisplay.pDisplay.egl.Display,
+ fgStructure.CurrentWindow->Window.pContext.egl.Config,
+ EGL_BUFFER_SIZE, &result ) )
+	 fgError( "eglGetConfigAttrib(EGL_BUFFER_SIZE) failed" );
+
+ return result;
+ }
+ }
+
+ default:
+ return fghPlatformGlutGetEGL( eWhat );
+ }
+}
+

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_structure_wl.c Added

@@ -0,0 +1,40 @@
+/*
+ * fg_structure_wl.c
+ *
+ * Windows and menus need tree structure for Wayland
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Tue Mar 17, 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "fg_internal.h"
+#include "egl/fg_structure_egl.h"
+
+extern SFG_Structure fgStructure;
+
+void fgPlatformCreateWindow( SFG_Window *window )
+{
+ fghPlatformCreateWindowEGL( window );
+
+ window->State.pWState.OldHeight = window->State.pWState.OldWidth = -1;
+}
+

_service:tar_scm:freeglut-3.4.0.tar.gz/src/wayland/fg_window_wl.c Added

@@ -0,0 +1,310 @@
+/*
+ * fg_window_wl.c
+ *
+ * Window management methods for Wayland
+ *
+ * Copyright (c) 2015 Manuel Bachmann. All Rights Reserved.
+ * Written by Manuel Bachmann, <tarnyko@tarnyko.net>
+ * Creation date: Tue Mar 17, 2015
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * MANUEL BACHMANN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define FREEGLUT_BUILDING_LIB
+#include <GL/freeglut.h>
+#include "../fg_internal.h"
+#include "egl/fg_window_egl.h"
+#define fghCreateNewContext fghCreateNewContextEGL
+
+extern void fghOnReshapeNotify( SFG_Window *window, int width, int height, GLboolean forceNotify );
+void fgPlatformReshapeWindow( SFG_Window *window, int width, int height );
+void fgPlatformIconifyWindow( SFG_Window *window );
+
+
+static void fghShSurfacePing( void* data,
+ struct wl_shell_surface* shsurface,
+ uint32_t serial )
+{
+ wl_shell_surface_pong( shsurface, serial );
+}
+static void fghShSurfaceConfigure( void* data,
+ struct wl_shell_surface* shsurface,
+ uint32_t edges,
+ int32_t width, int32_t height )
+{
+ SFG_Window* window = data;
+ fgPlatformReshapeWindow( window, width, height );
+}
+static const struct wl_shell_surface_listener fghShSurfaceListener =
+{
+ fghShSurfacePing,
+ fghShSurfaceConfigure,
+ NULL
+};
+
+
+static int fghToggleFullscreen(void)
+{
+ SFG_Window* win = fgStructure.CurrentWindow;
+
+ if ( ! win->State.IsFullscreen )
+ {
+ win->State.pWState.OldWidth = win->State.Width;
+ win->State.pWState.OldHeight = win->State.Height;
+ wl_shell_surface_set_fullscreen( win->Window.pContext.shsurface,
+ WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
+ 0, NULL );
+ }
+ else
+ {
+ fgPlatformReshapeWindow( win, win->State.pWState.OldWidth,
+ win->State.pWState.OldHeight );
+ wl_shell_surface_set_toplevel( win->Window.pContext.shsurface );
+ }
+
+ return 0;
+}
+
+void fgPlatformOpenWindow( SFG_Window* window, const char* title,
+ GLboolean positionUse, int x, int y,
+ GLboolean sizeUse, int w, int h,
+ GLboolean gameMode, GLboolean isSubWindow )
+{
+ /* Save the display mode if we are creating a menu window */
+ if( window->IsMenu && ( ! fgStructure.MenuContext ) )
+ fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;
+
+ fghChooseConfig( &window->Window.pContext.egl.Config );
+
+ if( ! window->Window.pContext.egl.Config )
+ {
+ /*
+ * The "fghChooseConfig" returned a null meaning that the visual
+ * context is not available.
+ * Try a couple of variations to see if they will work.
+ */
+ if( fgState.DisplayMode & GLUT_MULTISAMPLE )
+ {
+ fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
+ fghChooseConfig( &window->Window.pContext.egl.Config );
+ fgState.DisplayMode |= GLUT_MULTISAMPLE;
+ }
+ }
+
+ FREEGLUT_INTERNAL_ERROR_EXIT( window->Window.pContext.egl.Config != NULL,
+ "EGL configuration with necessary capabilities "
+ "not found", "fgOpenWindow" );
+
+ if( ! positionUse )
+ x = y = -1; /* default window position */
+ if( ! sizeUse )
+ w = h = 300; /* default window size */
+
+ /* Create the cursor */
+ window->Window.pContext.cursor = wl_cursor_theme_get_cursor(
+ fgDisplay.pDisplay.cursor_theme,
+ "left_ptr" ); 
+ window->Window.pContext.cursor_surface = wl_compositor_create_surface(
+ fgDisplay.pDisplay.compositor );
+
+ /* Create the main surface */
+ window->Window.pContext.surface = wl_compositor_create_surface(
+ fgDisplay.pDisplay.compositor );
+
+ /* Create the shell surface with respects to the parent/child tree */
+ window->Window.pContext.shsurface = wl_shell_get_shell_surface(
+ fgDisplay.pDisplay.shell,
+ window->Window.pContext.surface );
+ wl_shell_surface_add_listener( window->Window.pContext.shsurface,
+ &fghShSurfaceListener, window );
+
+ if( title)
+ wl_shell_surface_set_title( window->Window.pContext.shsurface, title );
+
+ if( gameMode )
+ {
+ window->State.IsFullscreen = GL_TRUE;
+ wl_shell_surface_set_fullscreen( window->Window.pContext.shsurface,
+ WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
+ 0, NULL );
+ }
+ else if( !isSubWindow && !window->IsMenu )
+ {
+ wl_shell_surface_set_toplevel( window->Window.pContext.shsurface );
+ }
+ else
+ {
+ wl_shell_surface_set_transient( window->Window.pContext.shsurface,
+ window->Parent->Window.pContext.surface,
+ x, y, 0 );
+ }
+
+ /* Create the Wl_EGL_Window */
+ window->Window.Context = fghCreateNewContext( window );
+ window->Window.pContext.egl_window = wl_egl_window_create( 
+ window->Window.pContext.surface,
+ w, h);
+ window->Window.pContext.egl.Surface = eglCreateWindowSurface( 
+ fgDisplay.pDisplay.egl.Display,
+ window->Window.pContext.egl.Config,
+ (EGLNativeWindowType)window->Window.pContext.egl_window,
+ NULL );
+ eglMakeCurrent( fgDisplay.pDisplay.egl.Display, window->Window.pContext.egl.Surface,
+ window->Window.pContext.egl.Surface, window->Window.Context );
+
+ window->Window.pContext.pointer_button_pressed = GL_FALSE;
+}
+
+
+/*
+ * Request a window resize
+ */
+void fgPlatformReshapeWindow( SFG_Window *window, int width, int height )
+{
+ fghOnReshapeNotify(window, width, height, GL_FALSE);
+
+ if( window->Window.pContext.egl_window )
+ wl_egl_window_resize( window->Window.pContext.egl_window,
+ width, height, 0, 0 );
+}
+
+
+/*
+ * Closes a window, destroying the frame and OpenGL context
+ */
+void fgPlatformCloseWindow( SFG_Window* window )
+{
+ fghPlatformCloseWindowEGL(window);
+
+ if ( window->Window.pContext.egl_window )
+ wl_egl_window_destroy( window->Window.pContext.egl_window );
+ if ( window->Window.pContext.shsurface )
+ wl_shell_surface_destroy( window->Window.pContext.shsurface );
+ if ( window->Window.pContext.surface )
+ wl_surface_destroy( window->Window.pContext.surface );

_service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_cmap_x11.c Added

@@ -0,0 +1,75 @@
+/* fg_cmap_x11.c
+ *
+ * X11 implementation of the colormap functions
+ *
+ * Copyright (C) 2022 John Tsiombikas <nuclear@member.fsf.org>
+ * Creation date: Tue August 30 2022
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include <GL/freeglut.h>
+#include "../fg_internal.h"
+
+void fgPlatformSetColor(int idx, float r, float g, float b)
+{
+	Display *dpy = fgDisplay.pDisplay.Display;
+	Colormap cmap = fgStructure.CurrentWindow->Window.cmap;
+	int cmap_size = fgStructure.CurrentWindow->Window.cmap_size;
+	XColor color;
+
+	if(idx >= 0 && idx < cmap_size) {
+		color.pixel = idx;
+		color.red = (unsigned short)(r * 65535.0f);
+		color.green = (unsigned short)(g * 65535.0f);
+		color.blue = (unsigned short)(b * 65535.0f);
+		color.flags = DoRed | DoGreen | DoBlue;
+		XStoreColor(dpy, cmap, &color);
+	}
+}
+
+float fgPlatformGetColor(int idx, int comp)
+{
+	Display *dpy = fgDisplay.pDisplay.Display;
+	Colormap cmap = fgStructure.CurrentWindow->Window.cmap;
+	int cmap_size = fgStructure.CurrentWindow->Window.cmap_size;
+	XColor color;
+
+	if(idx < 0 || idx >= cmap_size) {
+		return -1.0f;
+	}
+
+	color.pixel = idx;
+	XQueryColor(dpy, cmap, &color);
+	switch(comp) {
+	case GLUT_RED:
+		return color.red / 65535.0f;
+	case GLUT_GREEN:
+		return color.green / 65535.0f;
+	case GLUT_BLUE:
+		return color.blue / 65535.0f;
+	default:
+		break;
+	}
+	return -1.0f;
+}
+
+void fgPlatformCopyColormap(int win)
+{
+	/* TODO */
+	fgWarning("glutCopyColormap not implemented yet on X11");
+}

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_gamemode_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_gamemode_x11.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_glutfont_definitions_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_glutfont_definitions_x11.c Changed

@@ -91,14 +91,25 @@
 };
 
 
-struct freeglutStrokeFont glutStrokeRoman ;
-struct freeglutStrokeFont glutStrokeMonoRoman ;
+static struct freeglutStrokeFont glutStrokeRoman_ ;
+static struct freeglutStrokeFont glutStrokeMonoRoman_ ;
 
-struct freeglutBitmapFont glutBitmap9By15 ;
-struct freeglutBitmapFont glutBitmap8By13 ;
-struct freeglutBitmapFont glutBitmapTimesRoman10 ;
-struct freeglutBitmapFont glutBitmapTimesRoman24 ;
-struct freeglutBitmapFont glutBitmapHelvetica10 ;
-struct freeglutBitmapFont glutBitmapHelvetica12 ;
-struct freeglutBitmapFont glutBitmapHelvetica18 ;
+static struct freeglutBitmapFont glutBitmap9By15_ ;
+static struct freeglutBitmapFont glutBitmap8By13_ ;
+static struct freeglutBitmapFont glutBitmapTimesRoman10_ ;
+static struct freeglutBitmapFont glutBitmapTimesRoman24_ ;
+static struct freeglutBitmapFont glutBitmapHelvetica10_ ;
+static struct freeglutBitmapFont glutBitmapHelvetica12_ ;
+static struct freeglutBitmapFont glutBitmapHelvetica18_ ;
 
+
+void *glutStrokeRoman = &glutStrokeRoman_ ;
+void *glutStrokeMonoRoman = &glutStrokeMonoRoman_ ;
+
+void *glutBitmap9By15 = &glutBitmap9By15_ ;
+void *glutBitmap8By13 = &glutBitmap8By13_ ;
+void *glutBitmapTimesRoman10 = &glutBitmapTimesRoman10_ ;
+void *glutBitmapTimesRoman24 = &glutBitmapTimesRoman24_ ;
+void *glutBitmapHelvetica10 = &glutBitmapHelvetica10_ ;
+void *glutBitmapHelvetica12 = &glutBitmapHelvetica12_ ;
+void *glutBitmapHelvetica18 = &glutBitmapHelvetica18_ ;

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_input_devices_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_input_devices_x11.c Changed

@@ -48,7 +48,7 @@
 
 typedef struct _serialport SERIALPORT;
 
-void serial_flush ( SERIALPORT *port );
+void fg_serial_flush ( SERIALPORT *port );
 
 /*****************************************************************/
 
@@ -59,7 +59,7 @@
 {
 }
 
-SERIALPORT *serial_open ( const char *device )
+SERIALPORT *fg_serial_open ( const char *device )
 {
     int fd;
     struct termios termio;
@@ -88,11 +88,11 @@
     cfsetospeed(&termio, B9600);
     tcsetattr(fd,TCSANOW,&termio);
 
-    serial_flush(port);
+    fg_serial_flush(port);
     return port;
 }
 
-void serial_close(SERIALPORT *port)
+void fg_serial_close(SERIALPORT *port)
 {
     if (port)
     {
@@ -103,7 +103,7 @@
     }
 }
 
-int serial_getchar(SERIALPORT *port)
+int fg_serial_getchar(SERIALPORT *port)
 {
     unsigned char ch;
     if (!port) return EOF;
@@ -111,13 +111,13 @@
     return EOF;
 }
 
-int serial_putchar(SERIALPORT *port, unsigned char ch)
+int fg_serial_putchar(SERIALPORT *port, unsigned char ch)
 {
     if (!port) return 0;
     return write(port->fd,&ch,1);
 }
 
-void serial_flush ( SERIALPORT *port )
+void fg_serial_flush ( SERIALPORT *port )
 {
     tcflush ( port->fd, TCIOFLUSH );
 }

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_internal_x11.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_internal_x11.h Changed

@@ -33,10 +33,10 @@
 #ifdef EGL_VERSION_1_0
 #include "egl/fg_internal_egl.h"
 #else
-#include <GL/glx.h>
 #include "x11/fg_internal_x11_glx.h"
 #endif
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 #include <X11/extensions/XInput.h>
@@ -96,17 +96,23 @@
 * much conditionally-compiled code later in the library.
 */
 #ifndef EGL_VERSION_1_0
-typedef Window SFG_WindowHandleType ;
-typedef GLXContext SFG_WindowContextType ;
+typedef Window SFG_WindowHandleType;
+typedef GLXContext SFG_WindowContextType;
+typedef Colormap SFG_WindowColormapType;
 #endif
+
 typedef struct tagSFG_PlatformContext SFG_PlatformContext;
 struct tagSFG_PlatformContext
 {
 #ifdef EGL_VERSION_1_0
 struct tagSFG_PlatformContextEGL egl;
 #else
+#ifdef USE_FBCONFIG
 GLXFBConfig FBConfig; /* The window's FBConfig */
-#endif
+#else
+	XVisualInfo *visinf;			/* for older GLX keep the visual info */
+#endif	/* !def GLX_VERSION_1_3 */
+#endif	/* !def EGL_VERSION_1_0 */
 };
 
 
@@ -119,7 +125,6 @@
 GLboolean KeyRepeating; /* Currently in repeat mode? */ 
 };
 
-
 /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */
 /*
 * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c"
@@ -136,21 +141,8 @@
 #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
-
-# 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
@@ -221,18 +213,18 @@
 
 /* -- PRIVATE FUNCTION DECLARATIONS ---------------------------------------- */
 /* spaceball device functions, defined in fg_spaceball.c */
-int fgIsSpaceballXEvent( const XEvent *ev );
-void fgSpaceballHandleXEvent( const XEvent *ev );
+int fgIsSpaceballXEvent(const XEvent *ev);
+void fgSpaceballHandleXEvent(const XEvent *ev);
 
 /*
 * Check if "hint" is present in "property" for "window". See fg_init.c
 */
-int fgHintPresent(Window window, Atom property, Atom hint);
+int fgHintPresent(Window window, Atom property, Atom hint);
 
 /* Handler for X extension Events */
 #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
- void fgHandleExtensionEvents( XEvent * ev );
- void fgRegisterDevices( Display* dpy, Window* win );
+void fgHandleExtensionEvents(XEvent *ev);
+void fgRegisterDevices(Display *dpy, Window win);
 #endif

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_internal_x11_glx.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_internal_x11_glx.h Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_joystick_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_joystick_x11.c Changed

@@ -42,15 +42,263 @@
 #include <fcntl.h>
 
 
+/* BSD defines from "jsBSD.cxx" around lines 42-270 */
+
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+
+# ifdef HAVE_USB_JS
+# if defined(__NetBSD__)
+# ifdef HAVE_USBHID_H
+# include <usbhid.h>
+# else
+# include <usb.h>
+# endif
+# include <dev/usb/usb.h>
+# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+# ifdef HAVE_USBHID_H
+# include <usbhid.h>
+# else
+# include <libusbhid.h>
+# endif
+#if __FreeBSD_version < 800061
+# include <legacy/dev/usb/usb.h>
+#else
+# include <dev/usb/usb_ioctl.h>
+# include <dev/usb/usb.h>
+#endif
+# endif
+# include <dev/usb/usbhid.h>
+
+/* Compatibility with older usb.h revisions */
+# if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
+# define USB_MAX_DEVNAMES MAXDEVNAMES
+# endif
+# endif
+
+struct os_specific_s {
+ char fname 128 ;
+ int fd;
+ int is_analog;
+ /* The following structure members are specific to analog joysticks */
+ struct joystick ajs;
+# ifdef HAVE_USB_JS
+ /* The following structure members are specific to USB joysticks */
+ struct hid_item *hids;
+ int hid_dlen;
+ int hid_offset;
+ char *hid_data_buf;
+ int axes_usage _JS_MAX_AXES ;
+# endif
+ /* We keep button and axes state ourselves, as they might not be updated
+ * on every read of a USB device
+ */
+ int cache_buttons;
+ float cache_axes _JS_MAX_AXES ;
+};
+
+/* Idents lower than USB_IDENT_OFFSET are for analog joysticks. */
+# define USB_IDENT_OFFSET 2
+
+# define USBDEV "/dev/usb"
+# define UHIDDEV "/dev/uhid"
+# define AJSDEV "/dev/joy"
+
+
+#endif
+
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+static int hatmap_x9 = {0, 0, 1, 1, 1, 0, -1, -1, -1};
+static int hatmap_y9 = {0, 1, 1, 0, -1, -1, -1, 0, 1};
+
+# ifdef HAVE_USB_JS
+/*
+* fghJoystickFindUSBdev (and its helper, fghJoystickWalkUSBdev) try to locate
+* the full name of a USB device. If /dev/usbN isn't readable, we punt and
+* return the uhidN device name. We warn the user of this situation once.
+*/
+static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
+{
+#if __FreeBSD_version < 800061
+ struct usb_device_info di;
+ int i, a;
+ char *cp;
+
+ for (a = 1; a < USB_MAX_DEVICES; a++) {
+ di.udi_addr = a;
+ if (ioctl(f, USB_DEVICEINFO, &di) != 0)
+ return NULL;
+ for (i = 0; i < USB_MAX_DEVNAMES; i++)
+ if (di.udi_devnamesi0 &&
+ strcmp(di.udi_devnamesi, dev) == 0) {
+ cp = calloc(1, strlen(di.udi_vendor) + strlen(di.udi_product) + 2);
+ strcpy(cp, di.udi_vendor);
+ strcat(cp, " ");
+ strcat(cp, di.udi_product);
+ strncpy(out, cp, outlen - 1);
+ outoutlen - 1 = 0;
+ free(cp);
+ return out;
+ }
+ }
+#endif
+ return NULL;
+}
+
+static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
+{
+ int i, f;
+ char buf50;
+ char *cp;
+ static int protection_warned = 0;
+
+ for (i = 0; i < 16; i++) {
+ snprintf(buf, sizeof(buf), "%s%d", USBDEV, i);
+ f = open(buf, O_RDONLY);
+ if (f >= 0) {
+ cp = fghJoystickWalkUSBdev(f, name, out, outlen);
+ close(f);
+ if (cp)
+ return 1;
+ }
+ else if (errno == EACCES) {
+ if (!protection_warned) {
+ fgWarning("Can't open %s for read!", buf);
+ protection_warned = 1;
+ }
+ }
+ }
+ return 0;
+}
+#endif
+
+static int fghJoystickInitializeHID(struct os_specific_s *os,
+ int *num_axes, int *num_buttons)
+{
+ int size, is_joystick;
+# ifdef HAVE_USBHID_H
+ int report_id = 0;
+# endif
+ struct hid_data *d;
+ struct hid_item h;
+ report_desc_t rd;
+
+ if ((rd = hid_get_report_desc(os->fd)) == 0)
+ {
+ fgWarning("error: %s: %s", os->fname, strerror(errno));
+ return FALSE;
+ }
+
+ os->hids = NULL;
+
+# ifdef HAVE_USBHID_H
+ if (ioctl(os->fd, USB_GET_REPORT_ID, &report_id) < 0)
+ {
+ /*** XXX {report_id} may not be the right variable? ***/
+ fgWarning("error: %s%d: %s", UHIDDEV, report_id, strerror(errno));
+ return FALSE;
+ }
+
+ size = hid_report_size(rd, hid_input, report_id);
+# else
+ size = hid_report_size(rd, 0, hid_input);
+# endif
+ os->hid_data_buf = calloc(1, size);
+ os->hid_dlen = size;
+
+ is_joystick = 0;
+# ifdef HAVE_USBHID_H
+ d = hid_start_parse(rd, 1 << hid_input, report_id);
+# else
+ d = hid_start_parse(rd, 1 << hid_input);
+# endif
+ while (hid_get_item(d, &h))
+ {
+ int usage, page, interesting_hid;
+
+ page = HID_PAGE(h.usage);
+ usage = HID_USAGE(h.usage);
+
+ /* This test is somewhat too simplistic, but this is how MicroSoft
+ * does, so I guess it works for all joysticks/game pads. */
+ is_joystick = is_joystick ||
+ (h.kind == hid_collection &&
+ page == HUP_GENERIC_DESKTOP &&
+ (usage == HUG_JOYSTICK || usage == HUG_GAME_PAD));
+
+ if (h.kind != hid_input)
+ continue;
+
+ if (!is_joystick)
+ continue;
+
+ interesting_hid = TRUE;
+ if (page == HUP_GENERIC_DESKTOP)
+ {
+ switch (usage)
+ {

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_main_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_main_x11.c Changed

@@ -135,10 +135,13 @@
 ret |= GLUT_ACTIVE_CTRL;
 if( state & Mod1Mask )
 ret |= GLUT_ACTIVE_ALT;
+ if( state & Mod2Mask )
+ ret |= GLUT_ACTIVE_SUPER;
 
 return ret;
 }
 
+#ifdef EVENT_DEBUG
 static const char* fghTypeToString( int type )
 {
 switch( type ) {
@@ -277,7 +280,7 @@
 }
 }
 
-__fg_unused static void fghPrintEvent( XEvent *event )
+static void fghPrintEvent( XEvent *event )
 {
 switch( event->type ) {
 
@@ -344,13 +347,11 @@
 XKeymapEvent *e = &event->xkeymap;
 char buf32 * 2 + 1;
 int i;
- for ( i = 0; i < 32; i++ ) {
- snprintf( &buf i * 2 , sizeof( buf ) - i * 2,
- "%02x", e->key_vector i );
+ for(i=0; i<32; i++) {
+ sprintf(buf + i * 2, "%02x", e->key_vectori);
 }
- buf i = '\0';
- fgWarning( "%s: window=0x%x, %s", fghTypeToString( e->type ), e->window,
- buf );
+ buf64 = 0;
+ fgWarning("%s: window=0x%x, %s", fghTypeToString(e->type), e->window, buf);
 break;
 }
 
@@ -535,31 +536,30 @@
 
 case ClientMessage: {
 XClientMessageEvent *e = &event->xclient;
- char buf 61 ;
- char* p = buf;
- char* end = buf + sizeof( buf );
+ char buf61;
+ char *p = buf;
 int i;
- switch( e->format ) {
+ switch(e->format) {
 case 8:
- for ( i = 0; i < 20; i++, p += 3 ) {
- snprintf( p, end - p, " %02x", e->data.b i );
+			for(i=0; i<20; i++, p+=3) {
+ sprintf(p, " %02x", e->data.bi);
 }
 break;
 case 16:
- for ( i = 0; i < 10; i++, p += 5 ) {
- snprintf( p, end - p, " %04x", e->data.s i );
+ for(i=0; i<10; i++, p+=5) {
+ sprintf(p, " %04x", e->data.si);
 }
 break;
 case 32:
- for ( i = 0; i < 5; i++, p += 9 ) {
- snprintf( p, end - p, " %08lx", e->data.l i );
+ for(i=0; i<5; i++, p+=9) {
+ sprintf(p, " %08lx", e->data.li);
 }
 break;
 }
 *p = '\0';
- fgWarning( "%s: window=0x%x, message_type=%lu, format=%d, data=(%s )",
- fghTypeToString( e->type ), e->window,
- (unsigned long)e->message_type, e->format, buf );
+ fgWarning("%s: window=0x%x, message_type=%lu, format=%d, data=(%s )",
+ fghTypeToString(e->type), e->window,
+ (unsigned long)e->message_type, e->format, buf);
 break;
 }
 
@@ -572,12 +572,12 @@
 break;
 }
 
- default: {
+ default:
 fgWarning( "%s", fghTypeToString( event->type ) );
 break;
 }
- }
 }
+#endif
 
 
 void fgPlatformProcessSingleEvent ( void )
@@ -600,7 +600,7 @@
 while( XPending( fgDisplay.pDisplay.Display ) )
 {
 XNextEvent( fgDisplay.pDisplay.Display, &event );
-#if _DEBUG
+#ifdef EVENT_DEBUG
 fghPrintEvent( &event );
 #endif
 
@@ -807,11 +807,8 @@
 case ButtonRelease:
 case ButtonPress:
 {
- GLboolean pressed = GL_TRUE;
- int button;
-
- if( event.type == ButtonRelease )
- pressed = GL_FALSE ;
+ GLboolean pressed;
+ int button, x, y;
 
 /*
 * A mouse button has been pressed or released. Traditionally,
@@ -829,59 +826,46 @@
 */
 button = event.xbutton.button - 1;
 
+ pressed = event.type == ButtonPress ? GL_TRUE : GL_FALSE;
+ x = event.xbutton.x;
+ y = event.xbutton.y;
+
 /*
 * Do not execute the application's mouse callback if a menu
 * is hooked to this button. In that case an appropriate
 * private call should be generated.
 */
- if( fgCheckActiveMenu( window, button, pressed,
- event.xbutton.x, event.xbutton.y ) )
+ if(fgCheckActiveMenu( window, button, pressed, x, y))
 break;
 
 /*
 * Check if there is a mouse or mouse wheel callback hooked to the
 * window
 */
- if( ! FETCH_WCB( *window, Mouse ) &&
- ! FETCH_WCB( *window, MouseWheel ) )
+ if(!FETCH_WCB(*window, Mouse) && !FETCH_WCB(*window, MouseWheel))
 break;
 
- fgState.Modifiers = fgPlatformGetModifiers( event.xbutton.state );
+ fgState.Modifiers = fgPlatformGetModifiers(event.xbutton.state);
 
- /* Finally execute the mouse or mouse wheel callback */
- if( ( button < glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS ) ) || ( ! FETCH_WCB( *window, MouseWheel ) ) )
- INVOKE_WCB( *window, Mouse, ( button,
- pressed ? GLUT_DOWN : GLUT_UP,
- event.xbutton.x,
- event.xbutton.y )
- );
- else
- {
- /*
- * Map 4 and 5 to wheel zero; EVEN to +1, ODD to -1
- * " 6 and 7 " " one; ...
- *
- * XXX This *should* be behind some variables/macros,
- * XXX since the order and numbering isn't certain
- * XXX See XFree86 configuration docs (even back in the
- * XXX 3.x days, and especially with 4.x).
- *
- * XXX Note that {button} has already been decremented
- * XXX in mapping from X button numbering to GLUT.
-				 *
-				 * XXX Should add support for partial wheel turns as Windows does -- 5/27/11
- */
- int wheel_number = (button - glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS )) / 2;
- int direction = -1;
- if( button % 2 )
- direction = 1;
-
- if( pressed )
- INVOKE_WCB( *window, MouseWheel, ( wheel_number,
- direction,
- event.xbutton.x,
- event.xbutton.y )
- );
+ /* Finally execute the mouse or mouse wheel callback.
+ * The mouse wheel is reported as buttons 4 (down) and 5 (up) by
+ * the X server. "button" has been converted to 0-based above, so
+ * that's 3 and 4 for us.
+ * If a wheel callback hasn't been registered, we simply treat them
+ * as button presses and pass them to the mouse handler. This is
+ * important for compatibility with the original GLUT.
+ */
+ if(button < 3 || button > 4 || !FETCH_WCB(*window, MouseWheel)) {
+ INVOKE_WCB(*window, Mouse, (button, pressed ? GLUT_DOWN : GLUT_UP, x, y));
+ } else {
+ if(pressed) {
+ int dir = button & 1 ? 1 : -1;

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_spaceball_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_spaceball_x11.c Changed

@@ -14,7 +14,7 @@
 
 #include <X11/Xlib.h>
 
-extern int sball_initialized;
+extern int fg_sball_initialized;
 
 enum {
 SPNAV_EVENT_ANY, /* used by spnav_remove_events() */
@@ -56,17 +56,17 @@
 {
 Window w;
 
- sball_initialized = 1;
+ fg_sball_initialized = 1;
 if(!fgStructure.CurrentWindow)
 {
- sball_initialized = -1;
+ fg_sball_initialized = -1;
 return;
 }
 
 w = fgStructure.CurrentWindow->Window.Handle;
 if(spnav_x11_open(fgDisplay.pDisplay.Display, w) == -1)
 {
- sball_initialized = -1;
+ fg_sball_initialized = -1;
 return;
 }
 }
@@ -105,7 +105,7 @@
 fgSpaceballSetWindow(fgStructure.CurrentWindow);
 }
 
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
 return 0;
 }
 
@@ -116,9 +116,9 @@
 {
 spnav_event sev;
 
- if(sball_initialized == 0) {
+ if(fg_sball_initialized == 0) {
 fgInitialiseSpaceball();
- if(sball_initialized != 1) {
+ if(fg_sball_initialized != 1) {
 return;
 }
 }
@@ -136,7 +136,8 @@
 break;
 
 case SPNAV_EVENT_BUTTON:
- INVOKE_WCB(*spnav_win, SpaceButton, (sev.button.bnum, sev.button.press ? GLUT_DOWN : GLUT_UP));
+ /* button numbers are 1-based in glutSpaceballButtonFunc */
+ INVOKE_WCB(*spnav_win, SpaceButton, (sev.button.bnum + 1, sev.button.press ? GLUT_DOWN : GLUT_UP));
 break;
 
 default:

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_state_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_state_x11.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_state_x11_glx.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_state_x11_glx.c Changed

@@ -29,21 +29,42 @@
 #include "fg_internal.h"
 #include "x11/fg_window_x11_glx.h"
 
+#ifndef GL_SAMPLES
+#define GL_SAMPLES	0x80a9
+#endif
+
 /*
  * Queries the GL context about some attributes
  */
-int fgPlatformGetConfig( int attribute )
+int fgPlatformGetConfig(int attribute)
 {
-  int returnValue = 0;
-  int result __fg_unused;  /*  Not checked  */
-
-  if( fgStructure.CurrentWindow )
-      result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
-                                     fgStructure.CurrentWindow->Window.pContext.FBConfig,
-                                     attribute,
-                                     &returnValue );
-
-  return returnValue;
+	int res, retval = 0;
+	Display *dpy;
+
+	if(!fgStructure.CurrentWindow) {
+		return 0;
+	}
+
+	dpy = fgDisplay.pDisplay.Display;
+	{
+#ifdef USE_FBCONFIG
+		GLXFBConfig fbcfg;
+		fbcfg = fgStructure.CurrentWindow->Window.pContext.FBConfig;
+		res = glXGetFBConfigAttrib(dpy, fbcfg, attribute, &retval);
+#else
+		XVisualInfo *vinf;
+		vinf = fgStructure.CurrentWindow->Window.pContext.visinf;
+		res = glXGetConfig(dpy, vinf, attribute, &retval);
+#endif
+	}
+
+	if(res != 0) {
+		if(res == GLX_BAD_ATTRIBUTE) {
+			fgWarning("Attempting to query invalid GLX attribute: 0x%04x\n", attribute);
+		}
+		return 0;
+	}
+	return retval;
 }
 
 int fghPlatformGlutGetGLX ( GLenum eWhat )
@@ -59,6 +80,7 @@
 	int nsamples = 0;
 #ifdef GLX_VERSION_1_3
         glGetIntegerv(GL_SAMPLES, &nsamples);
+        glGetError();	/* clear error if GL_SAMPLES is not supported */
 #endif
         return nsamples;
       }
@@ -83,6 +105,7 @@
     GLX_QUERY( GLUT_WINDOW_ACCUM_BLUE_SIZE,     GLX_ACCUM_BLUE_SIZE     );
     GLX_QUERY( GLUT_WINDOW_ACCUM_ALPHA_SIZE,    GLX_ACCUM_ALPHA_SIZE    );
     GLX_QUERY( GLUT_WINDOW_STEREO,              GLX_STEREO              );
+    GLX_QUERY( GLUT_WINDOW_SRGB,                GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB);
 
 #   undef GLX_QUERY
 
@@ -90,7 +113,11 @@
     case GLUT_DISPLAY_MODE_POSSIBLE:
     {
         /*  We should not have to call fghChooseConfig again here.  */
+#ifdef USE_FBCONFIG
         GLXFBConfig config;
+#else
+		XVisualInfo *config;
+#endif
         return fghChooseConfig(&config);
     }
 
@@ -99,7 +126,11 @@
         if( fgStructure.CurrentWindow == NULL )
             return 0;
 
+#ifdef USE_FBCONFIG
         return fgPlatformGetConfig( GLX_VISUAL_ID );
+#else
+		return fgStructure.CurrentWindow->Window.pContext.visinf->visualid;
+#endif
 
     default:
         fgWarning( "glutGet(): missing enum handle %d", eWhat );
@@ -109,6 +140,7 @@
 	return -1;
 }
 
+#ifdef USE_FBCONFIG
 int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
 {
   int *array;
@@ -212,3 +244,14 @@
 
   return array;
 }
+
+#else	/* !def USE_FBCONFIG */
+
+int *fgPlatformGlutGetModeValues(GLenum what, int *size)
+{
+	/* TODO */
+	*size = 0;
+	return 0;
+}
+
+#endif	/* !def USE_FBCONFIG */

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_structure_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_structure_x11.c Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_window_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_window_x11.c Changed

@@ -75,7 +75,7 @@
         XGetWindowAttributes(fgDisplay.pDisplay.Display,
                 fgStructure.CurrentWindow->Window.Handle,
                 &attributes);
-        
+
         /*
          * The "x" and "y" members of "attributes" are the window's coordinates
          * relative to its parent, i.e. to the decoration window.
@@ -145,299 +145,302 @@
                            GLboolean sizeUse, int w, int h,
                            GLboolean gameMode, GLboolean isSubWindow )
 {
-    XVisualInfo * visualInfo = NULL;
-    XSetWindowAttributes winAttr;
-    XTextProperty textProperty;
-    XSizeHints sizeHints;
-    XWMHints wmHints;
-    XEvent eventReturnBuffer; /* return buffer required for a call */
-    unsigned long mask;
-    unsigned int current_DisplayMode = fgState.DisplayMode ;
-    XEvent fakeEvent = {0};
-
-    /* Save the display mode if we are creating a menu window */
-    if( window->IsMenu && ( ! fgStructure.MenuContext ) )
-        fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;
+	Display *dpy = fgDisplay.pDisplay.Display;
+	Window rootwin = fgDisplay.pDisplay.RootWindow;
+	Window parent = window->Parent ? window->Parent->Window.Handle : 0;
+	Window win;
+	Colormap cmap;
+	XVisualInfo * visualInfo = NULL;
+	XSetWindowAttributes wattr;
+	XTextProperty txprop;
+	XSizeHints sizeHints;
+	XWMHints wmHints;
+	XEvent eventReturnBuffer; /* return buffer required for a call */
+	unsigned long mask;
+	unsigned int current_DisplayMode = fgState.DisplayMode;
+	XEvent fakeEvent = {0};
+	Atom xa_motif_wm_hints = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
+
+#ifdef EGL_VERSION_1_0
+	EGLint vid = 0;
+	XVisualInfo visualTemplate;
+	int num_visuals;
+#endif
+
+	/* Save the display mode if we are creating a menu window */
+	if(window->IsMenu && !fgStructure.MenuContext) {
+		fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB;
+	}
 
 #ifdef EGL_VERSION_1_0
 #define WINDOW_CONFIG window->Window.pContext.egl.Config
 #else
+#ifdef USE_FBCONFIG
 #define WINDOW_CONFIG window->Window.pContext.FBConfig
+#else
+#define WINDOW_CONFIG window->Window.pContext.visinf
+#endif  /* !def USE_FBCONFIG */
 #endif
-    fghChooseConfig(&WINDOW_CONFIG);
-
-    if( window->IsMenu && ( ! fgStructure.MenuContext ) )
-        fgState.DisplayMode = current_DisplayMode ;
-
-    if( ! WINDOW_CONFIG )
-    {
-        /*
-         * The "fghChooseConfig" returned a null meaning that the visual
-         * context is not available.
-         * Try a couple of variations to see if they will work.
-         */
+	fghChooseConfig(&WINDOW_CONFIG);
+
+	if(window->IsMenu && !fgStructure.MenuContext) {
+		fgState.DisplayMode = current_DisplayMode;
+	}
+
+	if(!WINDOW_CONFIG) {
+		/*
+		 * The "fghChooseConfig" returned a null meaning that the visual
+		 * context is not available.
+		 * Try a couple of variations to see if they will work.
+		 */
 #ifndef EGL_VERSION_1_0
-        if( !( fgState.DisplayMode & GLUT_DOUBLE ) )
-        {
-            fgState.DisplayMode |= GLUT_DOUBLE ;
-            fghChooseConfig(&WINDOW_CONFIG);
-            fgState.DisplayMode &= ~GLUT_DOUBLE;
-        }
-#endif
+		if(!(fgState.DisplayMode & GLUT_DOUBLE)) {
+			fgState.DisplayMode |= GLUT_DOUBLE;
+			fghChooseConfig(&WINDOW_CONFIG);
+			fgState.DisplayMode &= ~GLUT_DOUBLE;
 
-        if( fgState.DisplayMode & GLUT_MULTISAMPLE )
-        {
-            fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
-            fghChooseConfig(&WINDOW_CONFIG);
-            fgState.DisplayMode |= GLUT_MULTISAMPLE;
-        }
-    }
-
-    FREEGLUT_INTERNAL_ERROR_EXIT( WINDOW_CONFIG != NULL,
-                                  "FBConfig with necessary capabilities not found", "fgOpenWindow" );
-
-    /*  Get the X visual.  */
-#ifdef EGL_VERSION_1_0
-    EGLint vid = 0;
-    XVisualInfo visualTemplate;
-    int num_visuals;
-    if (!eglGetConfigAttrib(fgDisplay.pDisplay.egl.Display, window->Window.pContext.egl.Config, EGL_NATIVE_VISUAL_ID, &vid))
-      fgError("eglGetConfigAttrib(EGL_NATIVE_VISUAL_ID) failed");
-    visualTemplate.visualid = vid;
-    visualInfo = XGetVisualInfo(fgDisplay.pDisplay.Display, VisualIDMask, &visualTemplate, &num_visuals);
-#else
-    visualInfo = glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display,
-					   window->Window.pContext.FBConfig );
+			if(WINDOW_CONFIG) goto done_retry;
+		}
 #endif
 
-    FREEGLUT_INTERNAL_ERROR_EXIT( visualInfo != NULL,
-                                  "visualInfo could not be retrieved from FBConfig", "fgOpenWindow" );
-
-    /*
-     * XXX HINT: the masks should be updated when adding/removing callbacks.
-     * XXX       This might speed up message processing. Is that true?
-     * XXX
-     * XXX A: Not appreciably, but it WILL make it easier to debug.
-     * XXX    Try tracing old GLUT and try tracing freeglut.  Old GLUT
-     * XXX    turns off events that it doesn't need and is a whole lot
-     * XXX    more pleasant to trace.  (Think mouse-motion!  Tons of
-     * XXX    ``bonus'' GUI events stream in.)
-     */
-    winAttr.event_mask        =
-        StructureNotifyMask | SubstructureNotifyMask | ExposureMask |
-        ButtonPressMask | ButtonReleaseMask | KeyPressMask | KeyReleaseMask |
-        VisibilityChangeMask | EnterWindowMask | LeaveWindowMask |
-        PointerMotionMask | ButtonMotionMask;
-    winAttr.background_pixmap = None;
-    winAttr.background_pixel  = 0;
-    winAttr.border_pixel      = 0;
-
-    winAttr.colormap = XCreateColormap(
-        fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow,
-        visualInfo->visual, AllocNone
-    );
+		if(fgState.DisplayMode & GLUT_MULTISAMPLE) {
+			fgState.DisplayMode &= ~GLUT_MULTISAMPLE;
+			fghChooseConfig(&WINDOW_CONFIG);
+			fgState.DisplayMode |= GLUT_MULTISAMPLE;
 
-    mask = CWBackPixmap | CWBorderPixel | CWColormap | CWEventMask;
+			if(WINDOW_CONFIG) goto done_retry;
+		}
 
-    if( window->IsMenu || ( gameMode == GL_TRUE ) )
-    {
-        winAttr.override_redirect = True;
-        mask |= CWOverrideRedirect;
-    }
+		if(fgState.DisplayMode & GLUT_SRGB) {
+			fgState.DisplayMode &= ~GLUT_SRGB;
+			fghChooseConfig(&WINDOW_CONFIG);
+			fgState.DisplayMode |= GLUT_SRGB;
 
-    if( ! positionUse )
-        x = y = -1; /* default window position */
-    if( ! sizeUse )
-        w = h = 300; /* default window size */
+			if(WINDOW_CONFIG) goto done_retry;
+		}
+	}
+done_retry:
 
-    window->Window.Handle = XCreateWindow(
-        fgDisplay.pDisplay.Display,
-        window->Parent == NULL ? fgDisplay.pDisplay.RootWindow :
-        window->Parent->Window.Handle,
-        x, y, w, h, 0,
-        visualInfo->depth, InputOutput,
-        visualInfo->visual, mask,
-        &winAttr
-    );
+#ifdef USE_FBCONFIG
+	FREEGLUT_INTERNAL_ERROR_EXIT(WINDOW_CONFIG != NULL,
+			"FBConfig with necessary capabilities not found", "fgOpenWindow");
+#else
+	FREEGLUT_INTERNAL_ERROR_EXIT(WINDOW_CONFIG != NULL,
+			"GLX Visual with necessary capabilities not found", "fgOpenWindow");
+#endif
 
-    /* Fake configure event to force viewport setup
-     * even with no window manager.
-     */

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_window_x11_glx.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_window_x11_glx.c Changed

@@ -38,6 +38,7 @@
  * Chooses a visual basing on the current display mode settings
  */
 
+#ifdef USE_FBCONFIG
 int fghChooseConfig(GLXFBConfig* fbconfig)
 {
   GLboolean wantIndexedMode = GL_FALSE;
@@ -143,7 +144,7 @@
 
                 if (bufferSizeMax > bufferSizeMin)
                 {
-                    /* 
+                    /*
                      * Free and reallocate fbconfigArray, keeping only FBConfigs
                      * with the largest buffer size.
                      */
@@ -166,12 +167,11 @@
         else
         {
            *fbconfig = NULL;
-	   return 0;
+		   return 0;
         }
-	XFree(fbconfigArray);
-
-        return 1;
+		XFree(fbconfigArray);
     }
+    return 1;
 }
 
 static void fghFillContextAttributes( int *attributes ) {
@@ -220,14 +220,14 @@
   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;
   }
 
   /* 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 ) {
@@ -250,15 +250,116 @@
   return context;
 }
 
+#else	/* !defined USE_FBCONFIG */
+
+int fghChooseConfig(XVisualInfo **vinf_ret)
+{
+	Display *dpy = fgDisplay.pDisplay.Display;
+	int scr = DefaultScreen(dpy);
+	XVisualInfo *vi;
+	int attr32;
+	int *aptr = attr;
+	int *samples = 0;
+	unsigned int mode = fgState.DisplayMode;
+
+	if(mode & GLUT_DOUBLE) {
+		*aptr++ = GLX_DOUBLEBUFFER;
+	}
+
+	if(mode & GLUT_INDEX) {
+		*aptr++ = GLX_BUFFER_SIZE;
+		*aptr++ = 1;
+	} else {
+		*aptr++ = GLX_RGBA;
+		*aptr++ = GLX_RED_SIZE; *aptr++ = 1;
+		*aptr++ = GLX_GREEN_SIZE; *aptr++ = 1;
+		*aptr++ = GLX_BLUE_SIZE; *aptr++ = 1;
+	}
+	if(mode & GLUT_ALPHA) {
+		*aptr++ = GLX_ALPHA_SIZE;
+		*aptr++ = 1;
+	}
+	if(mode & GLUT_DEPTH) {
+		*aptr++ = GLX_DEPTH_SIZE;
+		*aptr++ = 8;
+	}
+	if(mode & GLUT_STENCIL) {
+		*aptr++ = GLX_STENCIL_SIZE;
+		*aptr++ = 1;
+	}
+	if(mode & GLUT_ACCUM) {
+		*aptr++ = GLX_ACCUM_RED_SIZE; *aptr++ = 1;
+		*aptr++ = GLX_ACCUM_GREEN_SIZE; *aptr++ = 1;
+		*aptr++ = GLX_ACCUM_BLUE_SIZE; *aptr++ = 1;
+	}
+	if(mode & GLUT_STEREO) {
+		*aptr++ = GLX_STEREO;
+	}
+	if(mode & GLUT_SRGB) {
+		*aptr++ = GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB;
+	}
+	if(mode & GLUT_MULTISAMPLE) {
+		*aptr++ = GLX_SAMPLE_BUFFERS;
+		*aptr++ = 1;
+		*aptr++ = GLX_SAMPLES;
+		samples = aptr;
+		*aptr++ = 32;	/* start high and attempt halving each time below */
+	}
+	*aptr++ = None;
+
+	if(!samples) {
+		vi = glXChooseVisual(dpy, scr, attr);
+	} else {
+		while(!(vi = glXChooseVisual(dpy, scr, attr)) && *samples) {
+			*samples >>= 1;
+			if(!*samples) {
+				aptr-3 = None;
+			}
+		}
+	}
+	if(vi) {
+		*vinf_ret = vi;
+		return 1;
+	}
+	return 0;
+}
+
+GLXContext fghCreateNewContext(SFG_Window* window)
+{
+	Display *dpy = fgDisplay.pDisplay.Display;
+	XVisualInfo *vi = window->Window.pContext.visinf;
+	GLXContext share_list = 0;
+	Bool direct = fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT;
+	GLXContext ctx;
+
+	if(!fghIsLegacyContextRequested(window)) {
+		fgWarning("Core profile context requested, but freeglut was compiled to "
+				"use the old GLX context creation mechanism.\n"
+				"Will create an unversioned old-style context instead.");
+	}
+
+	if(!(ctx = glXCreateContext(dpy, vi, share_list, direct))) {
+		fghContextCreationError();
+		return 0;
+	}
+	return ctx;
+}
+#endif	/* !defined USE_FBCONFIG */
+
 void fgPlatformSetWindow ( SFG_Window *window )
 {
     if ( window )
     {
+#ifdef GLX_VERSION_1_3
         glXMakeContextCurrent(
             fgDisplay.pDisplay.Display,
             window->Window.Handle,
             window->Window.Handle,
             window->Window.Context
         );
+#else
+		glXMakeCurrent(fgDisplay.pDisplay.Display, window->Window.Handle,
+				window->Window.Context);
+#endif
     }
 }

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_window_x11_glx.h -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_window_x11_glx.h Changed

_service:tar_scm:freeglut-3.0.0.tar.gz/src/x11/fg_xinput_x11.c -> _service:tar_scm:freeglut-3.4.0.tar.gz/src/x11/fg_xinput_x11.c Changed

_service:tar_scm:freeglut.yaml Changed