Commit Graph

1991 Commits

Author SHA1 Message Date
rkrolib
914a40acb4 Changed an "#elif TARGET_HOST_UNIX_X11" to "#else", since this simply
governed menu aesthetics.  I think that it's better to have a default
that works than to break completely, should freeglut ever be ported to
a new (non-WIN32, non-UNIX/X11) target.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@248 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-27 05:36:29 +00:00
rkrolib
f5a588101e Minor modifications to the menus:
* Updated an old "TODO BEFORE STABLE" comment.

 * Expanded a comment re. some #define macros.

 * Made colors and font choice system dependant.  The UNIX freeglut
   menus look more like UNIX GLUT menus, now.  (This is PURELY a
   cosmetic change.  But it achieves better compatibility visually.)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@247 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-27 05:32:14 +00:00
rkrolib
b906986ac4 Cleaned up glutMainLoop() a bit:
* Deleted numerous say-nothing-new comments.
 * Reformatted a say-something-useful comment to fit on an 80-column
   display.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@246 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-27 05:12:09 +00:00
rkrolib
4eeaaaa08c Partially (re-?)unified some of the glutMainLoopEvent() code. The only
code that really needs to be system-specific is the window event handling,
which in MS-WINDOWS is tucked into a separate function.  In UNIX/X11, it's
all spilled out into glutMainLoopEvent() for some reason.

If the X11 code could be tucked into another function, glutMainLoopEvent()
could be platform-independant.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@245 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-27 05:03:31 +00:00
rkrolib
09723d91eb Moved the idle callback out of glutMainLoopEvent() and into
glutMainLoop(), per discussion on the list.  The code looks okay,
to me, though I remain less than wholly convinced that treating idles
as special cases is the best way to go.  Still, a case can be made
for taking "non-event" idle callbacks out of the "event loop".
From an organizational perspective, I think that it's an improvement,
and it fixes a bug for at least one program.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@244 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-26 06:13:50 +00:00
rkrolib
9f78016727 Added John's text-positioning modification.
The lines that he was altering were very oddly-split, so while I was at
it, I repaired the line-break damage.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@243 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-26 05:59:15 +00:00
rkrolib
1ea15ad9e1 Committed change from Nigel to fix the joystick bug. (The joystick
code was not setting the GLUT window prior to calling callbacks.)

Please verify.  If so, this closes out, I think, the latter half of
that bug report, so anyone with the means to modify/close bug reports
should do so upon verification of the fix.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@242 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-26 05:44:07 +00:00
rkrolib
9464f61d1f Superficial cleanup of the code. Mostly taking lines such as:
...

  /*
   * <Enslish recapituation of the single following C statement>
   */
  <single C statement>

...and rewrote as:

  ...
  <single C statement>


freeglut_main.c still has a lot of that in it, but it looks a bit
better, now.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@241 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-26 05:38:12 +00:00
rkrolib
14801c8908 Added some error-checking (particularly w.r.t. strdup()).
Deleted numerous 4-line "padding" sequences of C-as-English trans-
literation comments.

Re-indented some (but not all) code that is using 2-space indentation.
(Most of the freeglut code seems to be using 4-space indentation.)


I did not touch the "INIT DISPLAY STRING PARSING" code, since it is
filled with a ton of over-long lines and also appears to be in more
flux than the rest of the code.  (Well, I added one error-check
to a strdup().)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@240 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-26 05:19:02 +00:00
rkrolib
6f7dc9821f Removed two more bogus "carriage return" references where the comments
were in fact talking about a line feed (a.k.a. newline, LF, ^J, \n, ...).


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@239 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-26 04:44:43 +00:00
rkrolib
04c6d13777 Fixed the buglet about failing to report the program's name on error-
messages.  Please test.  (Modified glutInit(), the state structure,
and the warn/err functions.)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@238 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-26 04:39:27 +00:00
puggles
fb3db77b9a Released 2.0.1
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@237 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-23 21:43:19 +00:00
cjp
f0f690766a Added --disable-replace-glut option to autoconf configure.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@236 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-21 11:41:54 +00:00
puggles
3a34c44f10 Noted the release of 2.0.0
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@234 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-15 09:25:32 +00:00
puggles
fcd6068be5 Version bump
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@233 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-15 09:24:08 +00:00
rkrolib
ba4ef53738 Swept the freeglut_font.c for comment cleanup:
* Got rid of the "rewrite C as English" comments.
 * Corrected several bogus references to "carriage returns" (in strings).
   The symbols were newlines or EOLs or LFs (\n).
   They were *not* carriage returns or CRs (\r).
 * Clarified the comments on glBitmap() calls.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@232 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-14 00:51:00 +00:00
rkrolib
fd81891b21 Small bug-fix that's been on my mind:
Modified the two Fractals* demos so that they only clear (for the random
one) or redraw (for the non-random one) if there is need to do so.  (E.g.,
pressing the space bar should not clear and redraw the random fractal since
no parameters are altered.)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@231 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-13 22:54:10 +00:00
rkrolib
6e00dab2da Removed the obsolete hack (or very ill-conceived dream), fgDisplayCursor().
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@230 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-13 22:36:27 +00:00
rkrolib
231ad89777 Cleaned up some of the style issues (mostly "fluff" comments) in
freeglut_display.c.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@229 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-13 02:09:14 +00:00
rkrolib
8e6aba17a4 Comment-cleaning sweep.
Mostly got rid of the say-it-in-English comments that were adding 1 line
of English and 2 or 3 lines of filler for each of several lines of C code.
Updated a couple of other comments, and tweaked some white-space.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@228 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-13 02:03:09 +00:00
rkrolib
20373fe203 Cleaned up the comments a bit in the callbacks.c file (mostly removed some
of the kill-4-lines-to-translate-one-line-of-C-into-English comments).


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@227 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-13 01:21:33 +00:00
rkrolib
1d59d1a43c Added all missing GLUT cursor types for X11.
(Type NONE is not properly supported, yet.)

Corrected behavior for the several old types:
 * Wrong glyphs.
 * Reversed glyphs (left/right confusion!)

There are some remaining imperfections, but it's a lot closer to
GLUT comformity, now.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@226 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-12 09:36:54 +00:00
rkrolib
0f0b50c51c Three tidying-up changes to the code of freeglut_callbacks.c;
none of them are Earth-shattering, but as I swept through
looking somewhat more systematically for errors, I picked
these off.  See the diff's for details.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@225 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-11 12:03:34 +00:00
rkrolib
57351b4682 Fixed a basic readability/style error in the code. (Two statements per
line are almost never a good idea; in this case the combined line was
past 80 columns.)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@224 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-11 11:36:11 +00:00
rkrolib
a2a78f13a1 Added a safety-check on a memory allocation. (Timers were using
dynamic memory allocation but NOT checking the result!)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@223 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-11 11:21:27 +00:00
rkrolib
8cad52a9c1 Committed two lines from John to help fix the menus a bit.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@222 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-11 11:13:23 +00:00
rkrolib
2dc7f60b59 Check the glutDisplayFunc() callback for being a NULL pointer. This is
illegal and is disallowed in GLUT 3.0+, so we disallow it too in
freeglut 2.0.1+


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@221 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-11 07:44:02 +00:00
rkrolib
45899e5ed9 Applied John's updated ReadConfigFile() changes to the fractals demos.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@220 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-09 16:34:23 +00:00
rkrolib
25545149da Fixed:
* glutInit() ordering w.r.t. glutInit*() and {argv} processing.
 * Aspect ratio.
 * Removed depth-buffer usage.  (Also done for Fractals in previous
   commit...)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@219 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-09 03:05:40 +00:00
rkrolib
8bde679512 A few minor changes:
* glutInit*() calls should preceed glutInit(), per se, generally.
   This is so that glutInit()'s configuration (which picks up on user
   parameters) can override application defaults.
 * glutInit() should be called before ANY attempt to process {argv, argc}.
   This is because there may be GLUT/freeglut parameters (such as
   "-display" on X11).
 * If the window is tall and skinny, rather than short and squat, we need
   to handle aspect ratios differently.

The first is a user-interface bug.  The second is a serious bug (especially
since the demo assumes that argv[1] contains a filename).  The third is a
display bug.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@218 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-09 03:00:04 +00:00
rkrolib
30d1e165a0 Changed CreateNotify (in X11 ONLY) to act like a ConfigureNotify event.
This is done so that subwindows on X11 will get "resize" events when
they are created.  Old GLUT did this---presumably by design in order
to ensure that (a) All windows get notified of their size as soon as
the window exists, and (b) probably more importantly, so that windows
and sub-windows behave as much alike as possible.  I believe that GLUT
was right to do this, and I believe that compatibility requires this
(I have a sample program that breaks in freeglut but not GLUT without
this fix).

I did not touch the Microsoft side, because I don't know what their
OS does---nor if old GLUT was historically system-dependant about this.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@217 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-08 20:17:10 +00:00
sandalle
65f88a4dc4 freeglut_menu.c:217,519,532: Fix menus to stay in the window (John Fay)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@216 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-08 19:17:07 +00:00
rkrolib
5a3594b831 Several updates from John and myself.
The broad outlines are:

 * Color schemes are now in variables, are closer to old GLUT, and
   are system dependant (as old GLUT did).
 * You can change the font to any bitmapped font more easily, which
   can aid in finding a better approximation.  (Old GLUT does not seem
   to have used a GLUT font for the menus, which causes problems for
   us.)  The menus rescale automatically, including the triangle "arrow"
   for sub-menus.
 * Menus have real borders, and the placement of highlighting is
   much improved.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@215 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-08 16:04:58 +00:00
rkrolib
de5aadf9b5 Fixed a bug in the menu callback behavior. Menus were not setting the
current window correctly.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@214 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-08 00:24:33 +00:00
sandalle
8436dd7205 freeglut_menu.c:328 Fix submenu triangle (John Fay)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@213 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-06 16:27:53 +00:00
puggles
c209cc5479 Tweaking for menu behavior in Linux regarding mouse whatnot - John Fay
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@212 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-04 15:06:42 +00:00
rkrolib
400a9b3d11 Applied a patch from "extraeme@netbsd.org" to add joystick support.
Untested, but it compiles for me.

Should also add Joystick support for older FreeBSD systems.  Also
untested.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@211 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-01 16:30:25 +00:00
rkrolib
7a6c02639a Added support for more arbitrary number of mouse buttons (though only the
first three can work with menus), in X.  This closes a compatibility gap
with old GLUT, and leaves us the option of supporting scroll-wheels
properly.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@210 7f0cb862-5218-0410-a997-914c9d46530a
2003-10-01 15:01:58 +00:00
cjp
e7a43013d4 Don't install the demos.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@208 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-27 12:29:03 +00:00
puggles
cae77387e4 Package the demos.dsw file.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@207 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-26 18:44:06 +00:00
puggles
b2f1ae6232 Demos workspace for MSVC users
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@206 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-26 18:43:12 +00:00
rkrolib
34a43b6ae5 Corrected a bug w.r.t. display and joystick events. When getting ready
to sleep, we need to go through ALL windows to check for pending joysticks
and to check for pending redisplays.  I was just going through all TOP-
LEVEL windows.  Eeek.  This won't do.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@205 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-24 06:26:36 +00:00
brianp
29a1cf87af added needClear flag to take care of initial window clear and window resize clears
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@204 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-23 14:17:13 +00:00
rkrolib
a3b3a309dd Per Nigel Stewart's comments, converted
#ifdef TARGET_HOST_...

to:

#if TARGET_HOST_...

in src/freeglut_init.c.  These changes should not have any functional
impact at this time, but you don't want bad examples lying around to
trip people up later.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@203 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-23 01:08:16 +00:00
rkrolib
93d944835a Fixed:
* GLUT_SINGLE now should behave more or less correctly.
   Thanks to Brian Paul!

 * Sleeping is now cognizant of outstanding redisplays.

 * Fractals_random has been restored more or less to as-before, save that
   it uses the more minimal glFlush() rather than glutSwapBuffers().
   glutSwapBuffers() was only required when freeglut was incorrectly
   handling promotion to double-buffering.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@202 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-23 01:03:41 +00:00
rkrolib
4d8a8e7085 Moved the #include/#ifdef/#define stuff up to the top.
Changed #ifdef to #if, per Nigel(?)'s comment.  Ooops.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@201 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-22 19:01:55 +00:00
cjp
a8482d4df4 Fix to allow demos to compile before freeglut has been installed.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@200 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-22 17:40:55 +00:00
puggles
185eab5c78 Add an idle function to ensure that the screen gets drawn even when callbacks are not generated by the mouse/keyboard.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@199 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-22 11:30:33 +00:00
puggles
4e7cf2f8da Note the possible buffer overflow in window_title
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@198 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-21 13:47:36 +00:00
puggles
71fbfebd41 Fix the window title.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@197 7f0cb862-5218-0410-a997-914c9d46530a
2003-09-21 13:36:43 +00:00